From 6b211a9b0111fea781a345f8675bcc4d31d088c9 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Tue, 16 Dec 2014 21:41:20 +0100 Subject: [PATCH] refs #358, using utility function in setup class --- src/blacksim/fsx/fsxsimulatorsetup.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/blacksim/fsx/fsxsimulatorsetup.cpp b/src/blacksim/fsx/fsxsimulatorsetup.cpp index c256bbcc8..43c82b4db 100644 --- a/src/blacksim/fsx/fsxsimulatorsetup.cpp +++ b/src/blacksim/fsx/fsxsimulatorsetup.cpp @@ -10,10 +10,13 @@ #include "fsxsimulatorsetup.h" #include "../../blackmisc/project.h" +#include "../fscommon/fscommonutil.h" #include "../fsx/simconnectutilities.h" + #include using namespace BlackMisc; +using namespace BlackSim::FsCommon; namespace BlackSim { @@ -27,14 +30,7 @@ namespace BlackSim if (CProject::isCompiledWithFsxSupport()) { // set FSX path - QSettings fsxRegistry("HKEY_CURRENT_USER\\Software\\Microsoft\\Microsoft Games\\Flight Simulator\\10.0", QSettings::NativeFormat); - QString fsxPath = fsxRegistry.value("AppPath").toString(); - if (fsxPath.isEmpty()) - { - // another trial - QSettings fsxRegistry("HKEY_LOCAL_MACHINE\\Software\\Microsoft\\Microsoft Games\\Flight Simulator\\10.0", QSettings::NativeFormat); - fsxPath = fsxRegistry.value("SetupPath").toString(); - } + QString fsxPath = CFsCommonUtil::fsxDirFromRegistry(); if (!fsxPath.isEmpty()) this->m_setup.value(CSimulatorSetup::SetupSimPath, CVariant(fsxPath)); } }