Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-04 02:06:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

[Workspaces] Fix restart launcher when elevated (#35064)

Browse Source
This commit is contained in:
Seraphima Zykova
2024-09-25 18:56:31 +03:00
committed by GitHub
parent cf5addab28
commit 4240a7cee0
4 changed files with 69 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/modules/Workspaces/WorkspacesWindowArranger/main.cpp
View File

@@ -35,17 +35,7 @@ int APIENTRY WinMain(HINSTANCE hInst, HINSTANCE hInstPrev, LPSTR cmdline, int cm
}
auto args = split(commandLine, L" ");
std::wstring id{};
if (args.size() == 1)
{
id = args[0];
}
else if (args.size() == 2)
{
id = args[1];
}
if (id.empty())
if (args.workspaceId.empty())
{
Logger::warn("Incorrect command line arguments: no workspace id");
return 1;
@@ -60,11 +50,11 @@ int APIENTRY WinMain(HINSTANCE hInst, HINSTANCE hInstPrev, LPSTR cmdline, int cm
{
auto file = WorkspacesData::TempWorkspacesFile();
auto res = JsonUtils::ReadSingleWorkspace(file);
if (res.isOk() && res.value().id == id)
if (res.isOk() && res.value().id == args.workspaceId)
{
projectToLaunch = res.getValue();
}
else
else if (res.isError())
{
Logger::error(L"Error reading temp file");
return 1;
@@ -86,7 +76,7 @@ int APIENTRY WinMain(HINSTANCE hInst, HINSTANCE hInstPrev, LPSTR cmdline, int cm
for (const auto& proj : workspaces)
{
if (proj.id == id)
if (proj.id == args.workspaceId)
{
projectToLaunch = proj;
break;
@@ -96,7 +86,7 @@ int APIENTRY WinMain(HINSTANCE hInst, HINSTANCE hInstPrev, LPSTR cmdline, int cm
if (projectToLaunch.id.empty())
{
Logger::critical(L"Workspace {} not found", id);
Logger::critical(L"Workspace {} not found", args.workspaceId);
return 1;
}