[Crossfire-cvs] SF.net SVN: crossfire:[20612] client/trunk/gtk-v2/src

[Crossfire C. r. messages. <cro...@li...>]

Revision: 20612
          http://sourceforge.net/p/crossfire/code/20612
Author:   partmedia
Date:     2018-11-19 00:54:08 +0000 (Mon, 19 Nov 2018)
Log Message:
-----------
Avoid stopping a nonexistent sound server

Modified Paths:
--------------
    client/trunk/gtk-v2/src/main.c
    client/trunk/gtk-v2/src/sound-vala.vala

Modified: client/trunk/gtk-v2/src/main.c
===================================================================
--- client/trunk/gtk-v2/src/main.c	2018-11-19 00:53:33 UTC (rev 20611)
+++ client/trunk/gtk-v2/src/main.c	2018-11-19 00:54:08 UTC (rev 20612)
@@ -464,7 +464,9 @@
          */
         reset_image_data();
         client_reset();
-        sound_server_stop(server);
+        if (server != NULL) {
+            sound_server_stop(server);
+        }
     }
 }
 

Modified: client/trunk/gtk-v2/src/sound-vala.vala
===================================================================
--- client/trunk/gtk-v2/src/sound-vala.vala	2018-11-19 00:53:33 UTC (rev 20611)
+++ client/trunk/gtk-v2/src/sound-vala.vala	2018-11-19 00:54:08 UTC (rev 20612)
@@ -1,5 +1,5 @@
 public class SoundServer : Object {
-    FileStream pipe;
+    FileStream? pipe;
 
     public bool spawn(string server_path) {
         string[] args = {server_path};

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.