diff options
| author | Hannah von Reth <hannah.vonreth@owncloud.com> | 2022-02-14 13:17:35 +0300 |
|---|---|---|
| committer | Hannah von Reth <hannah.vonreth@owncloud.com> | 2022-02-14 13:18:01 +0300 |
| commit | 4e9d05b3ea2be67b73a053927cde2f02045ec5bc (patch) | |
| tree | 7192123378a3aa8b8c0ea96cade592dd0daf9ad6 /src/gui/main.cpp | |
| parent | eed2730d8896f60601319b2380c117b3d7637094 (diff) | |
Fix merge
Diffstat (limited to 'src/gui/main.cpp')
| -rw-r--r-- | src/gui/main.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/main.cpp b/src/gui/main.cpp index ab1ad5699..0d6e19522 100644 --- a/src/gui/main.cpp +++ b/src/gui/main.cpp @@ -54,8 +54,10 @@ int main(int argc, char **argv) Utility::tweakUIStyle(); +#ifdef Q_OS_WIN // TODO: 2.11 move to platform class Utility::startShutdownWatcher(); +#endif // if handleStartup returns true, main() // needs to terminate here, e.g. because // the updater is triggered |