From 4584b50d18d48d777da4b7d7a53d7335cecf2880 Mon Sep 17 00:00:00 2001 From: Andreas Date: Thu, 10 Oct 2013 10:00:57 +0200 Subject: [PATCH] Fix wrong networkcache dir. --- dist/windows/clementine-portable.nsi | 12 ++++++------ src/main.cpp | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dist/windows/clementine-portable.nsi b/dist/windows/clementine-portable.nsi index b86c2d1b7..7ad6fbf6d 100644 --- a/dist/windows/clementine-portable.nsi +++ b/dist/windows/clementine-portable.nsi @@ -207,9 +207,9 @@ Section "Clementine" Clementine CreateDirectory $INSTDIR\data ; Check the OS. If Vista or newer, use Default Programs - nsisos::osversion - StrCpy $R0 $0 - IntCmp $R0 6 HasDefaultPrograms NoDefaultPrograms HasDefaultPrograms +; nsisos::osversion +; StrCpy $R0 $0 +; IntCmp $R0 6 HasDefaultPrograms NoDefaultPrograms HasDefaultPrograms ; HasDefaultPrograms: ; ; Register Clementine with Default Programs @@ -1654,9 +1654,9 @@ Section "Uninstall" ; DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" ; Check the OS. If Vista or newer, use Default Programs - nsisos::osversion - StrCpy $R0 $0 - IntCmp $R0 6 HasDefaultPrograms NoDefaultPrograms HasDefaultPrograms +; nsisos::osversion +; StrCpy $R0 $0 +; IntCmp $R0 6 HasDefaultPrograms NoDefaultPrograms HasDefaultPrograms ; HasDefaultPrograms: ; Unregister from Default Programs diff --git a/src/main.cpp b/src/main.cpp index 43e9a5957..66682e305 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -238,6 +238,8 @@ void CheckPortable() { } int main(int argc, char *argv[]) { + CheckPortable(); + if (CrashReporting::SendCrashReport(argc, argv)) { return 0; } @@ -318,8 +320,6 @@ int main(int argc, char *argv[]) { QtSingleApplication a(argc, argv); - CheckPortable(); - // A bug in Qt means the wheel_scroll_lines setting gets ignored and replaced // with the default value of 3 in QApplicationPrivate::initialize. {