Misc fixes

source/backend/CarlaUtils.cpp

@@ -27,16 +27,15 @@
 
 #ifndef CARLA_UTILS_CACHED_PLUGINS_ONLY
 # include "juce_audio_formats/juce_audio_formats.h"
+# ifdef HAVE_X11
+#  include <X11/Xlib.h>
+# endif
 #endif
 
 #ifdef CARLA_OS_MAC
 # include "juce_audio_processors/juce_audio_processors.h"
 #endif
 
-#ifdef HAVE_X11
-# include <X11/Xlib.h>
-#endif
-
 #include "../native-plugins/_data.cpp"
 
 namespace CB = CarlaBackend;

source/bridges-plugin/CarlaBridgePlugin.cpp

@@ -80,21 +80,15 @@ static void initSignalHandler()
 #ifdef CARLA_OS_WIN
     SetConsoleCtrlHandler(winSignalHandler, TRUE);
 #elif defined(CARLA_OS_LINUX)
-    struct sigaction sint;
     struct sigaction sterm;
     struct sigaction susr1;
 
-    sint.sa_handler  = closeSignalHandler;
-    sint.sa_flags    = SA_RESTART;
-    sint.sa_restorer = nullptr;
-    sigemptyset(&sint.sa_mask);
-    sigaction(SIGINT, &sint, nullptr);
-
     sterm.sa_handler  = closeSignalHandler;
     sterm.sa_flags    = SA_RESTART;
     sterm.sa_restorer = nullptr;
     sigemptyset(&sterm.sa_mask);
     sigaction(SIGTERM, &sterm, nullptr);
+    sigaction(SIGINT, &sterm, nullptr);
 
     susr1.sa_handler  = saveSignalHandler;
     susr1.sa_flags    = SA_RESTART;

source/carla_host.py

@@ -1843,7 +1843,7 @@ class HostWindow(QMainWindow):
 
         # set our gui as parent for all plugins UIs
         if self.host.manageUIs and not (self.host.isControl or self.host.isPlugin):
-            winIdStr = "%x" % self.winId()
+            winIdStr = "%x" % int(self.winId())
             self.host.set_engine_option(ENGINE_OPTION_FRONTEND_WIN_ID, 0, winIdStr)
 
     def hideEvent(self, event):