From 41fb17f39bd7182a8ef55185c4f524a6df4e3669 Mon Sep 17 00:00:00 2001 From: scrawl Date: Tue, 20 Jun 2017 00:13:32 +0200 Subject: [PATCH] Revert "Correcting https://bugs.openmw.org/issues/3906" This reverts commit b0abed00e59aa8472daf0bb55bd6f5096e1d013b. --- apps/launcher/maindialog.cpp | 8 +------- apps/launcher/maindialog.hpp | 1 - 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/apps/launcher/maindialog.cpp b/apps/launcher/maindialog.cpp index 46340dd9e..94e186db8 100644 --- a/apps/launcher/maindialog.cpp +++ b/apps/launcher/maindialog.cpp @@ -172,9 +172,6 @@ Launcher::FirstRunDialogResult Launcher::MainDialog::showFirstRunDialog() } } - if(!setupGameData()) - return FirstRunDialogResultFailure; - return setup() ? FirstRunDialogResultContinue : FirstRunDialogResultFailure; } @@ -347,10 +344,6 @@ bool Launcher::MainDialog::setupGameSettings() file.close(); } - return true; -} - -bool Launcher::MainDialog::setupGameData() { QStringList dataDirs; // Check if the paths actually contain data files @@ -386,6 +379,7 @@ bool Launcher::MainDialog::setupGameData() { } } } + return true; } diff --git a/apps/launcher/maindialog.hpp b/apps/launcher/maindialog.hpp index 8d0d61b8f..96b5c0b97 100644 --- a/apps/launcher/maindialog.hpp +++ b/apps/launcher/maindialog.hpp @@ -72,7 +72,6 @@ namespace Launcher bool setupLauncherSettings(); bool setupGameSettings(); bool setupGraphicsSettings(); - bool setupGameData(); void setVersionLabel();