Disable menu options on json load

common/command.cc

@@ -170,6 +170,7 @@ int CommandHandler::executeMain(std::unique_ptr<Context> ctx)
                     log_error("Loading design failed.\n");
 
                 customAfterLoad(w.getContext());
+                w.updateJsonLoaded();
             }
         } catch (log_execution_error_exception) {
             // show error is handled by gui itself

gui/basewindow.cc

@@ -302,8 +302,7 @@ void BaseMainWindow::load_json(std::string filename)
     if (parse_json_file(f, filename, ctx.get())) {
         log("Loading design successful.\n");
         Q_EMIT updateTreeView();
-        actionPack->setEnabled(true);
+        updateJsonLoaded();
-        onJsonLoaded();
     } else {
         actionLoadJSON->setEnabled(true);
         log("Loading design failed.\n");
@@ -425,4 +424,11 @@ void BaseMainWindow::disableActions()
     onDisableActions();
 }
 
+void BaseMainWindow::updateJsonLoaded()
+{
+    disableActions();
+    actionPack->setEnabled(true);
+    onJsonLoaded();
+}
+
 NEXTPNR_NAMESPACE_END

gui/basewindow.h

@@ -48,12 +48,12 @@ class BaseMainWindow : public QMainWindow
     explicit BaseMainWindow(std::unique_ptr<Context> context, ArchArgs args, QWidget *parent = 0);
     virtual ~BaseMainWindow();
     Context *getContext() { return ctx.get(); }
-
+    void updateJsonLoaded();
-    void load_json(std::string filename);
-
   protected:
     void createMenusAndBars();
     void disableActions();
+    void load_json(std::string filename);
+
     virtual void onDisableActions(){};
     virtual void onJsonLoaded(){};
     virtual void onPackFinished(){};

gui/ice40/mainwindow.h

@@ -34,9 +34,10 @@ class MainWindow : public BaseMainWindow
 
   public:
     void createMenu();
-    void load_pcf(std::string filename);
 
   protected:
+    void load_pcf(std::string filename);
+
     void onDisableActions() override;
     void onJsonLoaded() override;
     void onRouteFinished() override;