From 3bca0e761597f590fa3b1c6a57ee325e774e3f49 Mon Sep 17 00:00:00 2001 From: isanae <14251494+isanae@users.noreply.github.com> Date: Sun, 10 Jan 2021 22:06:38 -0500 Subject: split run() into setup() and run() this is so command line processing can happen outside of MOApplication many important objects were local to run(), so they're not members of MOApplication instead --- src/instancemanager.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/instancemanager.h') diff --git a/src/instancemanager.h b/src/instancemanager.h index 73082da2..893b88e4 100644 --- a/src/instancemanager.h +++ b/src/instancemanager.h @@ -264,7 +264,7 @@ public: // instance name in the registry is empty or non-existent and there is no // portable instance set up // - std::optional currentInstance() const; + std::unique_ptr currentInstance() const; // sets the instance name in the registry so the same instance is opened next // time MO runs @@ -359,7 +359,7 @@ enum class SetupInstanceResults // instance manager dialog and returns the selected instance or empty if the // user cancelled // -std::optional selectInstance(); +std::unique_ptr selectInstance(); // calls instance.setup() tries to handle problems by itself: // -- cgit v1.3.1