Rewrite applyConfiguration check

free-audio · Jun 17, 2024 · cccc104 · cccc104
1 parent fe1d73c
commit cccc104
Showing 1 changed file with 14 additions and 10 deletions.
diff --git a/include/clap/helpers/plugin.hxx b/include/clap/helpers/plugin.hxx
@@ -826,20 +826,24 @@ namespace clap { namespace helpers {
       auto methodName = "clap_plugin_configurable_audio_ports.apply_configuration";
       self.ensureMainThread(methodName);
       self.ensureIsInactive(methodName);
-      if (l >= CheckingLevel::Minimal &&
-          !self.configurableAudioPortsCanApplyConfiguration(requests, request_count)) {
-         self.hostMisbehaving(
-            "Host requested a configuration that the plugin did not accept. Check with "
-            "clap_plugin_configurable_audio_ports.can_apply_configuration before applying a "
-            "configuration!");
-      }
-
-      return self.configurableAudioPortsApplyConfiguration(requests, request_count);
-   }
 
+      bool canApplyConfiguration;
+      if (l >= CheckingLevel::Minimal) {
+         canApplyConfiguration =
+            self.configurableAudioPortsCanApplyConfiguration(requests, request_count);
+      }
 
+      bool applyConfigurationSuccess =
+         self.configurableAudioPortsApplyConfiguration(requests, request_count);
 
+      if (l >= CheckingLevel::Minimal && canApplyConfiguration != applyConfigurationSuccess) {
+         self._host.pluginMisbehaving(
+            "Plugin's functions clap_plugin_configurable_audio_ports.can_apply_configuration and "
+            "clap_plugin_configurable_audio_ports.apply_configuration returned different values "
+            "for the same configuration.");
       }
+
+      return applyConfigurationSuccess;
    }
 
    //--------------------//