From b873c9bc8221fe368cc46eda0865387f58f86d34 Mon Sep 17 00:00:00 2001
From: iLLiCiTiT <jakub.trllo@gmail.com>
Date: Fri, 27 Nov 2020 03:33:49 +0100
Subject: [PATCH] updated base with new changes

---
 pype/tools/settings/settings/widgets/base.py | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pype/tools/settings/settings/widgets/base.py b/pype/tools/settings/settings/widgets/base.py
index c6db3c34de..3e1c6ea6b9 100644
--- a/pype/tools/settings/settings/widgets/base.py
+++ b/pype/tools/settings/settings/widgets/base.py
@@ -21,7 +21,11 @@ from pype.settings.lib import (
 
     save_studio_settings,
     save_project_settings,
-    save_project_anatomy
+    save_project_anatomy,
+
+    apply_overrides,
+    find_environments,
+    DuplicatedEnvGroups
 )
 from .widgets import UnsavedChangesDialog
 from . import lib
@@ -216,6 +220,9 @@ class SystemWidget(QtWidgets.QWidget):
 
         values = lib.convert_gui_data_to_overrides(_data.get("system", {}))
 
+        if not self.duplicated_env_group_validation(overrides=values):
+            return
+
         save_studio_settings(values)
 
         self._update_values()
@@ -528,7 +535,7 @@ class ProjectWidget(QtWidgets.QWidget):
         layout.addWidget(project_list_widget, 0)
         layout.addWidget(configurations_widget, 1)
 
-        save_btn.clicked.connect(self._save)
+        save_btn.clicked.connect(self._save_overrides)
         project_list_widget.project_changed.connect(self._on_project_change)
 
         self.project_list_widget = project_list_widget
@@ -655,7 +662,7 @@ class ProjectWidget(QtWidgets.QWidget):
                 has_invalid = True
 
         if not has_invalid:
-            return self._save_overrides()
+            return True
 
         invalid_items = []
         for item in self.input_fields:
@@ -673,6 +680,7 @@ class ProjectWidget(QtWidgets.QWidget):
         self.scroll_widget.ensureWidgetVisible(first_invalid_item)
         if first_invalid_item.isVisible():
             first_invalid_item.setFocus(True)
+        return False
 
     def _on_refresh(self):
         self.reset()