diff options
| author | Andrew <forkk@forkk.net> | 2013-12-01 14:28:47 -0600 |
|---|---|---|
| committer | Andrew <forkk@forkk.net> | 2013-12-01 14:28:47 -0600 |
| commit | 613699b3626aea750093ab7eaaeccaa28c0e87c6 (patch) | |
| tree | 7fd542b8f4be10359ba2aaeac9834f1b5c86a750 /MultiMC.cpp | |
| parent | 2427ad687137bbcfc7303a931d7e0b74d5325e48 (diff) | |
| parent | 75c4d97b90e39f2bda6e682def0fdda044cbcf6f (diff) | |
| download | MultiMC-613699b3626aea750093ab7eaaeccaa28c0e87c6.tar MultiMC-613699b3626aea750093ab7eaaeccaa28c0e87c6.tar.gz MultiMC-613699b3626aea750093ab7eaaeccaa28c0e87c6.tar.lz MultiMC-613699b3626aea750093ab7eaaeccaa28c0e87c6.tar.xz MultiMC-613699b3626aea750093ab7eaaeccaa28c0e87c6.zip | |
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop
Diffstat (limited to 'MultiMC.cpp')
| -rw-r--r-- | MultiMC.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/MultiMC.cpp b/MultiMC.cpp index a41f5f0a..e10292ab 100644 --- a/MultiMC.cpp +++ b/MultiMC.cpp @@ -189,6 +189,9 @@ MultiMC::MultiMC(int &argc, char **argv) : QApplication(argc, argv), case QNetworkProxy::FtpCachingProxy: proxyDesc = "FTP caching: "; break; + default: + proxyDesc = "DERP proxy: "; + break; } proxyDesc += QString("%3@%1:%2 pass %4") .arg(proxy.hostName()) @@ -326,6 +329,7 @@ void MultiMC::initGlobalSettings() m_settings->registerSetting(new Setting("InstSortMode", "Name")); + m_settings->registerSetting(new Setting("SelectedInstance", QString())); // Persistent value for the client ID m_settings->registerSetting(new Setting("YggdrasilClientToken", "")); |