Merge pull request #4980 from irgolic/dont-show-welcome-on-swp-load

Dont show welcome screen when loading crashed workflow
biolab · Oct 8, 2020 · 4968f79 · 4968f79
2 parents 5ece097 + d27d7ca
commit 4968f79
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Orange/canvas/__main__.py b/Orange/canvas/__main__.py
@@ -643,8 +643,8 @@ def show_message(message):
                  open_requests[-1])
         canvas_window.load_scheme(open_requests[-1].toLocalFile())
     else:
-        canvas_window.ask_load_swp_if_exists()
-        if want_welcome:
+        swp_loaded = canvas_window.ask_load_swp_if_exists()
+        if not swp_loaded and want_welcome:
             canvas_window.welcome_dialog()
 
     # local references prevent destruction

diff --git a/requirements-gui.txt b/requirements-gui.txt
@@ -1,4 +1,4 @@
-orange-canvas-core>=0.1.15,<0.2a
+orange-canvas-core>=0.1.16,<0.2a
 orange-widget-base>=4.8.1
 
 PyQt5>=5.12,!=5.15.1  # 5.15.1 skipped because of QTBUG-87057 - affects select columns