Merge branch 'master' into apa-bits

src/widgets/Window.cpp

@@ -10,7 +10,7 @@
 #include "singletons/WindowManager.hpp"
 #include "util/InitUpdateButton.hpp"
 #include "util/Shortcut.hpp"
-#include "widgets/AccountSwitchPopupWidget.hpp"
+#include "widgets/AccountSwitchPopup.hpp"
 #include "widgets/Notebook.hpp"
 #include "widgets/dialogs/SettingsDialog.hpp"
 #include "widgets/dialogs/UpdateDialog.hpp"
@@ -377,13 +377,13 @@ void Window::onAccountSelected()
 {
     auto user = getApp()->accounts->twitch.getCurrent();
 
-#ifdef CHATTERINO_NIGHTLY_VERSION_STRING
-    auto windowTitleEnd =
-        QString("Chatterino Nightly " CHATTERINO_VERSION
-                " (" UGLYMACROHACK(CHATTERINO_NIGHTLY_VERSION_STRING) ")");
-#else
+    //#ifdef CHATTERINO_NIGHTLY_VERSION_STRING
+    //    auto windowTitleEnd =
+    //        QString("Chatterino Nightly " CHATTERINO_VERSION
+    //                " (" UGLYMACROHACK(CHATTERINO_NIGHTLY_VERSION_STRING) ")");
+    //#else
     auto windowTitleEnd = QString("Chatterino " CHATTERINO_VERSION);
-#endif
+    //#endif
 
     this->setWindowTitle(windowTitleEnd);