Merge branch 'development' of https://github.com/danielhrisca/asammdf …

…into development
danielhrisca · Sep 8, 2023 · 127d28d · 127d28d
2 parents acd4877 + c023774
commit 127d28d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/asammdf/gui/widgets/tree.py b/src/asammdf/gui/widgets/tree.py
@@ -2118,7 +2118,7 @@ def set_conversion(self, conversion):
                 child.set_conversion(conversion)
 
     def set_disabled(self, disabled, preserve_subgroup_state=True):
-        if self.type() == self.Channel:
+        if self.type() == self.Channel and self.parent().isDisabled() == disabled:
             self.setDisabled(disabled)
             if self.details is not None:
                 self.details.setDisabled(disabled)

diff --git a/src/asammdf/version.py b/src/asammdf/version.py
@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 """ asammdf version module """
 
-__version__ = "7.3.15.dev6"
+__version__ = "7.3.15.dev7"