diff --git a/RedPandaIDE/RedPandaIDE.pro b/RedPandaIDE/RedPandaIDE.pro
index 664171a6..fcef9278 100644
--- a/RedPandaIDE/RedPandaIDE.pro
+++ b/RedPandaIDE/RedPandaIDE.pro
@@ -10,7 +10,7 @@ isEmpty(APP_NAME) {
 }
 
 isEmpty(APP_VERSION) {
-    APP_VERSION = 2.5
+    APP_VERSION = 2.6
 }
 
 macos: {
diff --git a/RedPandaIDE/editor.cpp b/RedPandaIDE/editor.cpp
index 0b397027..96bd5121 100644
--- a/RedPandaIDE/editor.cpp
+++ b/RedPandaIDE/editor.cpp
@@ -556,7 +556,8 @@ void Editor::focusOutEvent(QFocusEvent *event)
 {
     SynEdit::focusOutEvent(event);
     //pMainWindow->updateClassBrowserForEditor(nullptr);
-    pMainWindow->functionTip()->hide();
+    if (!pMainWindow->isQuitting())
+        pMainWindow->functionTip()->hide();
 }
 
 void Editor::keyPressEvent(QKeyEvent *event)
diff --git a/RedPandaIDE/main.cpp b/RedPandaIDE/main.cpp
index 2a1bb2cf..d38b1346 100644
--- a/RedPandaIDE/main.cpp
+++ b/RedPandaIDE/main.cpp
@@ -406,10 +406,8 @@ int main(int argc, char *argv[])
         }
 
         int retCode = app.exec();
-        QString configDir = pSettings->dirs().config();
-        // save settings
-        // settings->compilerSets().saveSets();
         if (mainWindow.shouldRemoveAllSettings()) {
+            QString configDir = pSettings->dirs().config();
             settings.release();
             delete pSettings;
             QDir dir(configDir);
diff --git a/RedPandaIDE/mainwindow.cpp b/RedPandaIDE/mainwindow.cpp
index 039529ef..68de1ec2 100644
--- a/RedPandaIDE/mainwindow.cpp
+++ b/RedPandaIDE/mainwindow.cpp
@@ -437,6 +437,7 @@ MainWindow::MainWindow(QWidget *parent)
 
 MainWindow::~MainWindow()
 {
+    mQuitting=true;
     delete mProjectProxyModel;
     delete mEditorList;
     delete ui;
diff --git a/Red_Panda_CPP.pro b/Red_Panda_CPP.pro
index 09a4d887..08c8465d 100644
--- a/Red_Panda_CPP.pro
+++ b/Red_Panda_CPP.pro
@@ -33,7 +33,7 @@ RedPandaIDE.depends += redpanda-git-askpass
 
 APP_NAME = RedPandaCPP
 
-APP_VERSION = 2.5
+APP_VERSION = 2.6
 
 linux: {
     isEmpty(PREFIX) {