From 848c098f6c4ce51f0f7ffaa4be567ea151d236fc Mon Sep 17 00:00:00 2001
From: falkTX <falktx@gmail.com>
Date: Wed, 1 Jan 2014 06:43:10 +0000
Subject: [PATCH] Fix for pluginId, forgot about this before

---
 source/backend/plugin/CarlaPlugin.cpp         | 2 +-
 source/backend/plugin/CarlaPluginInternal.hpp | 8 ++++----
 source/carla                                  | 2 +-
 source/carla-plugin                           | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/source/backend/plugin/CarlaPlugin.cpp b/source/backend/plugin/CarlaPlugin.cpp
index bbc68751f..5c0ebf9bf 100644
--- a/source/backend/plugin/CarlaPlugin.cpp
+++ b/source/backend/plugin/CarlaPlugin.cpp
@@ -188,7 +188,7 @@ unsigned int CarlaPluginProtectedData::loadSettings(const unsigned int options,
 // Constructor and destructor
 
 CarlaPlugin::CarlaPlugin(CarlaEngine* const engine, const unsigned int id)
-    : pData(new CarlaPluginProtectedData(engine, this))
+    : pData(new CarlaPluginProtectedData(engine, id, this))
 {
     CARLA_SAFE_ASSERT_RETURN(engine != nullptr,);
     CARLA_ASSERT(id < engine->getMaxPluginNumber());
diff --git a/source/backend/plugin/CarlaPluginInternal.hpp b/source/backend/plugin/CarlaPluginInternal.hpp
index f0f5404bf..75f2e8bd8 100644
--- a/source/backend/plugin/CarlaPluginInternal.hpp
+++ b/source/backend/plugin/CarlaPluginInternal.hpp
@@ -634,10 +634,10 @@ struct CarlaPluginProtectedData {
 #endif
     } osc;
 
-    CarlaPluginProtectedData(CarlaEngine* const e, CarlaPlugin* const p)
-        : engine(e),
+    CarlaPluginProtectedData(CarlaEngine* const eng, const unsigned int idx, CarlaPlugin* const self)
+        : engine(eng),
           client(nullptr),
-          id(0),
+          id(idx),
           hints(0x0),
           options(0x0),
           active(false),
@@ -654,7 +654,7 @@ struct CarlaPluginProtectedData {
           filename(nullptr),
           iconName(nullptr),
           identifier(nullptr),
-          osc(e, p) {}
+          osc(eng, self) {}
 
 #ifdef CARLA_PROPER_CPP11_SUPPORT
     CarlaPluginProtectedData() = delete;
diff --git a/source/carla b/source/carla
index 6c23bd64c..36ad1058e 100755
--- a/source/carla
+++ b/source/carla
@@ -235,8 +235,8 @@ class CarlaHostW(HostWindow):
     # -----------------------------------------------------------------
 
     def resizeEvent(self, event):
-        self.updateInfoLabelSize()
         HostWindow.resizeEvent(self, event)
+        self.updateInfoLabelSize()
 
     def timerEvent(self, event):
         HostWindow.timerEvent(self, event)
diff --git a/source/carla-plugin b/source/carla-plugin
index 5ee25aee8..e909b9522 100755
--- a/source/carla-plugin
+++ b/source/carla-plugin
@@ -313,7 +313,7 @@ class CarlaMiniW(HostWindow, ExternalUI):
             if not self.idleExternalUI():
                 self.d_uiQuit()
 
-        QWidget.timerEvent(self, event)
+        HostWindow.timerEvent(self, event)
 
     def closeEvent(self, event):
         self.closeExternalUI()