Merge pull request #39 from MarkusRannare/bug_fix_startup_crash

Fixed crash during startup due mod.io button been removed before
modio · Oct 16, 2020 · 46d7aa1 · 46d7aa1
2 parents 6c8f7a7 + cb1779d
commit 46d7aa1
Showing 1 changed file with 28 additions and 24 deletions.
diff --git a/Source/modioEditor/Private/modioEditor.cpp b/Source/modioEditor/Private/modioEditor.cpp
@@ -71,30 +71,34 @@ static bool Disabled() { return false; }
 
 void FmodioEditorModule::MapCommands()
 {
-  PluginCommands->MapAction(
-    FmodioEditorCommands::Get().Login,
-    FExecuteAction::CreateRaw(this, &FmodioEditorModule::PluginButtonClicked),
-    FCanExecuteAction::CreateStatic( &FmodioEditorModule::Enabled_LoginButton ) );
-
-  PluginCommands->MapAction(
-    FmodioEditorCommands::Get().Logout,
-    FExecuteAction::CreateRaw( this, &FmodioEditorModule::PluginButtonClicked ),
-    FCanExecuteAction::CreateStatic( &FmodioEditorModule::Enabled_LogoutButton ) );
-
-  PluginCommands->MapAction(
-    FmodioEditorCommands::Get().UploadMod,
-    FExecuteAction::CreateRaw( this, &FmodioEditorModule::PluginButtonClicked ),
-    FCanExecuteAction::CreateStatic( &Disabled ) );
-
-  PluginCommands->MapAction(
-    FmodioEditorCommands::Get().NewModWizard,
-    FExecuteAction::CreateRaw( this, &FmodioEditorModule::PluginButtonClicked ),
-    FCanExecuteAction::CreateStatic( &Disabled ) );
-
-  PluginCommands->MapAction(
-    FmodioEditorCommands::Get().Settings,
-    FExecuteAction::CreateRaw( this, &FmodioEditorModule::PluginButtonClicked ),
-    FCanExecuteAction::CreateStatic( &Disabled ) );
+  // We have disabled all the plugin commands as the button isn't there anymore
+  if(0)
+  {
+    PluginCommands->MapAction(
+      FmodioEditorCommands::Get().Login,
+      FExecuteAction::CreateRaw(this, &FmodioEditorModule::PluginButtonClicked),
+      FCanExecuteAction::CreateStatic( &FmodioEditorModule::Enabled_LoginButton ) );
+
+    PluginCommands->MapAction(
+      FmodioEditorCommands::Get().Logout,
+      FExecuteAction::CreateRaw( this, &FmodioEditorModule::PluginButtonClicked ),
+      FCanExecuteAction::CreateStatic( &FmodioEditorModule::Enabled_LogoutButton ) );
+
+    PluginCommands->MapAction(
+      FmodioEditorCommands::Get().UploadMod,
+      FExecuteAction::CreateRaw( this, &FmodioEditorModule::PluginButtonClicked ),
+      FCanExecuteAction::CreateStatic( &Disabled ) );
+
+    PluginCommands->MapAction(
+      FmodioEditorCommands::Get().NewModWizard,
+      FExecuteAction::CreateRaw( this, &FmodioEditorModule::PluginButtonClicked ),
+      FCanExecuteAction::CreateStatic( &Disabled ) );
+
+    PluginCommands->MapAction(
+      FmodioEditorCommands::Get().Settings,
+      FExecuteAction::CreateRaw( this, &FmodioEditorModule::PluginButtonClicked ),
+      FCanExecuteAction::CreateStatic( &Disabled ) );
+    }
 }
 
 void FmodioEditorModule::PluginButtonClicked()