Showing the changes to interface/src/Application.cpp (1 of 1 file). Show all
Unified · Split
| @@ -580,16 +580,13 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 579 unmodified lines | |||
| 580 | 580 | ||
| 581 | bool wantsSandboxRunning = shouldRunServer(); | 581 | bool wantsSandboxRunning = shouldRunServer(); |
| 582 | static bool determinedSandboxState = false; | 582 | static bool determinedSandboxState = false; |
| 583 | static bool sandboxRunning = false; | ||
| 584 | SandboxUtils sandboxUtils; | 583 | SandboxUtils sandboxUtils; |
| 585 | sandboxUtils.ifLocalSandboxRunningElse([&]() { | 584 | sandboxUtils.ifLocalSandboxRunningElse([&]() { |
| 586 | qCDebug(interfaceapp) << "Home sandbox appears to be running....."; | 585 | qCDebug(interfaceapp) << "Home sandbox appears to be running....."; |
| 587 | determinedSandboxState = true; | 586 | determinedSandboxState = true; |
| 588 | sandboxRunning = true; | ||
| 589 | }, [&, wantsSandboxRunning]() { | 587 | }, [&, wantsSandboxRunning]() { |
| 590 | qCDebug(interfaceapp) << "Home sandbox does not appear to be running...."; | 588 | qCDebug(interfaceapp) << "Home sandbox does not appear to be running...."; |
| 591 | determinedSandboxState = true; | 589 | determinedSandboxState = true; |
| 592 | sandboxRunning = false; | ||
| 593 | if (wantsSandboxRunning) { | 590 | if (wantsSandboxRunning) { |
| 594 | QString contentPath = getRunServerPath(); | 591 | QString contentPath = getRunServerPath(); |
| 595 | SandboxUtils::runLocalSandbox(contentPath, true, RUNNING_MARKER_FILENAME); | 592 | SandboxUtils::runLocalSandbox(contentPath, true, RUNNING_MARKER_FILENAME); |