summaryrefslogtreecommitdiffstats
path: root/application/MultiMC.h
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2017-01-14 15:47:58 +0100
committerPetr Mrázek <peterix@gmail.com>2017-01-14 15:47:58 +0100
commita6ef0059cced7f2736d0800c54c238d4d6511575 (patch)
tree967355800e01119ddc5be5d9e979ae7427661131 /application/MultiMC.h
parent3e81e2cb5b5d00c8f73c479cf9190131a3041f35 (diff)
downloadMultiMC-a6ef0059cced7f2736d0800c54c238d4d6511575.tar
MultiMC-a6ef0059cced7f2736d0800c54c238d4d6511575.tar.gz
MultiMC-a6ef0059cced7f2736d0800c54c238d4d6511575.tar.lz
MultiMC-a6ef0059cced7f2736d0800c54c238d4d6511575.tar.xz
MultiMC-a6ef0059cced7f2736d0800c54c238d4d6511575.zip
GH-1665 attempt at workaround for MultiMC not starting on macOS Sierra
This tries to detect the issue and instructs the user to fix it by moving the application to /Applications or ~/Applications. In addition, several other previously poorly handled fatal errors now show an error dialog.
Diffstat (limited to 'application/MultiMC.h')
-rw-r--r--application/MultiMC.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/application/MultiMC.h b/application/MultiMC.h
index 846bb152..7600a120 100644
--- a/application/MultiMC.h
+++ b/application/MultiMC.h
@@ -50,6 +50,8 @@ public:
enum Status
{
StartingUp,
+ UnwritableLog,
+ FailedShowError,
Failed,
Succeeded,
Initialized
@@ -172,7 +174,7 @@ private slots:
void setupWizardFinished(int status);
private:
- void initLogger();
+ bool initLogger();
void shutdownLogger();
void initIcons();
void initThemes();
@@ -186,6 +188,9 @@ private:
void shutdownAnalytics();
void performMainStartupAction();
+ // sets the fatal error message and m_status to Failed.
+ void showFatalErrorMessage(const QString & title, const QString & content);
+
private:
QDateTime startTime;