From 32dfa4490c15dffe2cbff8c59580c471c0bcbc1d Mon Sep 17 00:00:00 2001
From: falkTX <falktx@gmail.com>
Date: Mon, 7 Jul 2014 21:15:02 +0100
Subject: [PATCH] Misc

---
 source/backend/CarlaEngine.hpp            |  4 +++-
 source/backend/engine/CarlaEngine.cpp     | 14 ++++++++------
 source/backend/engine/CarlaEngineJack.cpp |  4 ++--
 source/backend/engine/CarlaEngineOsc.cpp  |  6 ++----
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/source/backend/CarlaEngine.hpp b/source/backend/CarlaEngine.hpp
index 7477cdc83..10db7fcc2 100644
--- a/source/backend/CarlaEngine.hpp
+++ b/source/backend/CarlaEngine.hpp
@@ -702,13 +702,15 @@ public:
 
     /*!
      * Close engine.
+     * This function always closes the engine even if it returns false.
+     * In other words, even when something goes wrong when closing the engine it still be closed nonetheless.
      */
     virtual bool close();
 
     /*!
      * Idle engine.
      */
-    virtual void idle();
+    virtual void idle() noexcept;
 
     /*!
      * Check if engine is running.
diff --git a/source/backend/engine/CarlaEngine.cpp b/source/backend/engine/CarlaEngine.cpp
index 3de857ab8..f3b69e046 100644
--- a/source/backend/engine/CarlaEngine.cpp
+++ b/source/backend/engine/CarlaEngine.cpp
@@ -839,7 +839,7 @@ bool CarlaEngine::close()
     return true;
 }
 
-void CarlaEngine::idle()
+void CarlaEngine::idle() noexcept
 {
     CARLA_SAFE_ASSERT_RETURN(pData->nextAction.opcode == kEnginePostActionNull,); // TESTING, remove later
     CARLA_SAFE_ASSERT_RETURN(pData->nextPluginId == pData->maxPluginNumber,);     // TESTING, remove later
@@ -850,10 +850,14 @@ void CarlaEngine::idle()
         CarlaPlugin* const plugin(pData->plugins[i].plugin);
 
         if (plugin != nullptr && plugin->isEnabled())
-            plugin->idle();
+        {
+            try {
+                plugin->idle();
+            } CARLA_SAFE_EXCEPTION_CONTINUE("Plugin idle");
+        }
     }
 
-    idleOsc();
+    pData->osc.idle();
 }
 
 CarlaEngineClient* CarlaEngine::addClient(CarlaPlugin* const)
@@ -2060,9 +2064,7 @@ bool CarlaEngine::isOscControlRegistered() const noexcept
 
 void CarlaEngine::idleOsc() const noexcept
 {
-    try {
-        pData->osc.idle();
-    } catch(...) {}
+    pData->osc.idle();
 }
 
 const char* CarlaEngine::getOscServerPathTCP() const noexcept
diff --git a/source/backend/engine/CarlaEngineJack.cpp b/source/backend/engine/CarlaEngineJack.cpp
index b61f551d7..4fca075cc 100644
--- a/source/backend/engine/CarlaEngineJack.cpp
+++ b/source/backend/engine/CarlaEngineJack.cpp
@@ -980,7 +980,7 @@ public:
     }
 
 #ifndef BUILD_BRIDGE
-    void idle() override
+    void idle() noexcept override
     {
         CarlaEngine::idle();
 
@@ -1810,7 +1810,7 @@ private:
     PatchbayConnectionList fUsedConnections;
     LinkedList<uint>       fNewGroups;
 
-    bool findPluginIdAndIcon(const char* const clientName, int& pluginId, PatchbayIcon& icon)
+    bool findPluginIdAndIcon(const char* const clientName, int& pluginId, PatchbayIcon& icon) noexcept
     {
         carla_debug("CarlaEngineJack::findPluginIdAndIcon(\"%s\", ...)", clientName);
 
diff --git a/source/backend/engine/CarlaEngineOsc.cpp b/source/backend/engine/CarlaEngineOsc.cpp
index 430c594e8..7a91addef 100644
--- a/source/backend/engine/CarlaEngineOsc.cpp
+++ b/source/backend/engine/CarlaEngineOsc.cpp
@@ -117,8 +117,7 @@ void CarlaEngineOsc::idle() const noexcept
             try {
                 if (lo_server_recv_noblock(fServerTCP, 0) == 0)
                     break;
-            }
-            CARLA_SAFE_EXCEPTION_CONTINUE("OSC idle TCP")
+            } CARLA_SAFE_EXCEPTION_CONTINUE("OSC idle TCP")
         }
     }
 
@@ -129,8 +128,7 @@ void CarlaEngineOsc::idle() const noexcept
             try {
                 if (lo_server_recv_noblock(fServerUDP, 0) == 0)
                     break;
-            }
-            CARLA_SAFE_EXCEPTION_CONTINUE("OSC idle UDP")
+            } CARLA_SAFE_EXCEPTION_CONTINUE("OSC idle UDP")
         }
     }
 }