zynaddsubfx

commit dbc94ddf01717056018c6a3b883a14fcd080ac4e
parent 32f0177531b392c57d72902e26d1adb7f5f0e51d
Author: fundamental <mark.d.mccurry@gmail.com>
Date:   Fri, 23 Oct 2015 10:55:30 -0400

Fix All Non-fluid Based Build Warnings

Diffstat:
M
src/UI/MasterUI.fl
 | 
14
++++++++++----

1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/UI/MasterUI.fl b/src/UI/MasterUI.fl
@@ -19,7 +19,7 @@ decl {\#include <string.h>} {public local
 
 decl {\#if ! defined(PLUGINVERSION) && HAS_X11
 \#include "zynaddsubfx.xpm"
-\#endif} {public local
+\#endif} {private local
 } 
 
 decl {\#include "WidgetPDial.h"} {public local
@@ -1522,9 +1522,15 @@ last_xmz->callback = [this](std::string filestr) {
     } else
        last_loaded[0] = 0;
     last_loaded[XMZ_PATH_MAX - 1] = 0;
-    char *label = last_loaded[0] == 0 ? NULL
-                  : ((label = strrchr(last_loaded, '/'))) ? label+1
-		  : last_loaded;
+    char *label = NULL;
+    if(last_loaded[0] != 0) {
+        label = strrchr(last_loaded, '/');
+        if(label && *label)
+            label = label+1;
+        else
+            label = last_loaded;
+    }
+
     setfilelabel(label);
 };
 last_xmz->doUpdate("/last_xmz");