d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-01-11 07:18:08 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #18456 from sledgehammer999/win_shorcut_cwd

Browse Source 
Fix PDB loading for valid stacktraces
This commit is contained in:
sledgehammer999 2023-01-27 17:52:39 +02:00 committed by GitHub
commit c6a1b977b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/windows/installer.nsi vendored
View File

@ -35,6 +35,8 @@ Section $(inst_qbt_req) ;"qBittorrent (required)"
SetOutPath "$INSTDIR\translations" SetOutPath "$INSTDIR\translations"
; Put files there ; Put files there
File /r "translations\qt*.qm" File /r "translations\qt*.qm"
; Restore output path because it affects `CreateShortCut`. It affects the "Start in" field.
SetOutPath $INSTDIR
; Write the installation path into the registry ; Write the installation path into the registry
WriteRegStr HKLM "Software\qBittorrent" "InstallLocation" "$INSTDIR" WriteRegStr HKLM "Software\qBittorrent" "InstallLocation" "$INSTDIR"

11
src/app/main.cpp
View File

@ -118,6 +118,17 @@ int main(int argc, char *argv[])
// Create Application // Create Application
auto app = std::make_unique<Application>(argc, argv); auto app = std::make_unique<Application>(argc, argv);
#ifdef Q_OS_WIN
// QCoreApplication::applicationDirPath() needs an Application object instantiated first
// Let's hope that there won't be a crash before this line
const char *envName = "_NT_SYMBOL_PATH";
const QString envValue = qEnvironmentVariable(envName);
if (envValue.isEmpty())
qputenv(envName, Application::applicationDirPath().toLocal8Bit());
else
qputenv(envName, u"%1;%2"_qs.arg(envValue, Application::applicationDirPath()).toLocal8Bit());
#endif
const QBtCommandLineParameters params = app->commandLineArgs(); const QBtCommandLineParameters params = app->commandLineArgs();
if (!params.unknownParameter.isEmpty()) if (!params.unknownParameter.isEmpty())
{ {