diff --git a/resources/buttons/copyDarkTheme.png b/resources/buttons/copyDarkTheme.png new file mode 100644 index 000000000..e225ee4ea --- /dev/null +++ b/resources/buttons/copyDarkTheme.png @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + Trashcan top + + + + + + + diff --git a/src/RunGui.cpp b/src/RunGui.cpp index 7c56d8d3a..5f86a6a4a 100644 --- a/src/RunGui.cpp +++ b/src/RunGui.cpp @@ -9,6 +9,7 @@ #include "common/NetworkManager.hpp" #include "singletons/Paths.hpp" #include "singletons/Updates.hpp" +#include "util/CombinePath.hpp" #include "widgets/dialogs/LastRunCrashDialog.hpp" #ifdef USEWINSDK @@ -113,6 +114,23 @@ void runGui(QApplication &a, Paths &paths, Settings &settings) { initQt(); + auto thread = std::thread([dir = paths.miscDirectory] { + { + auto path = combinePath(dir, "Update.exe"); + if (QFile::exists(path)) + { + QFile::remove(path); + } + } + { + auto path = combinePath(dir, "update.zip"); + if (QFile::exists(path)) + { + QFile::remove(path); + } + } + }); + chatterino::NetworkManager::init(); chatterino::Updates::getInstance().checkForUpdates(); diff --git a/src/singletons/WindowManager.cpp b/src/singletons/WindowManager.cpp index a53ee4588..c91d88440 100644 --- a/src/singletons/WindowManager.cpp +++ b/src/singletons/WindowManager.cpp @@ -26,9 +26,9 @@ #include #include #include +#include #include -#include #define SETTINGS_FILENAME "/window-layout.json" @@ -44,9 +44,9 @@ namespace { return windows_arr; } - std::optional &shouldMoveOutOfBoundsWindow() + boost::optional &shouldMoveOutOfBoundsWindow() { - static std::optional x; + static boost::optional x; return x; } } // namespace