diff --git a/gui/cppcheck_de.ts b/gui/cppcheck_de.ts
index df400c19b..fea41f30d 100644
--- a/gui/cppcheck_de.ts
+++ b/gui/cppcheck_de.ts
@@ -130,8 +130,8 @@ kate -l(line) (file)</oldsource>
         <location filename="main.ui" line="26"/>
         <location filename="mainwindow.cpp" line="221"/>
         <location filename="mainwindow.cpp" line="507"/>
-        <location filename="mainwindow.cpp" line="609"/>
-        <location filename="mainwindow.cpp" line="627"/>
+        <location filename="mainwindow.cpp" line="619"/>
+        <location filename="mainwindow.cpp" line="637"/>
         <source>Cppcheck</source>
         <translation type="unfinished"></translation>
     </message>
@@ -361,35 +361,28 @@ kate -l(line) (file)</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="503"/>
-        <source>Cannot exit while checking.
-
-Stop the checking before exiting.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="534"/>
+        <location filename="mainwindow.cpp" line="544"/>
         <source>License</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="541"/>
+        <location filename="mainwindow.cpp" line="551"/>
         <source>Authors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="549"/>
+        <location filename="mainwindow.cpp" line="559"/>
         <source>XML files (*.xml);;Text files (*.txt);;CSV files (*.csv)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="551"/>
+        <location filename="mainwindow.cpp" line="561"/>
         <source>Save the report file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.cpp" line="449"/>
-        <location filename="mainwindow.cpp" line="559"/>
+        <location filename="mainwindow.cpp" line="569"/>
         <source>XML files (*.xml)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -399,22 +392,29 @@ Stop the checking before exiting.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="565"/>
+        <location filename="mainwindow.cpp" line="503"/>
+        <source>Checking is running.
+
+Do you want to stop the checking and exit Cppcheck?.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="575"/>
         <source>Text files (*.txt)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="571"/>
+        <location filename="mainwindow.cpp" line="581"/>
         <source>CSV files (*.csv)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="611"/>
+        <location filename="mainwindow.cpp" line="621"/>
         <source>Cppcheck - %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="628"/>
+        <location filename="mainwindow.cpp" line="638"/>
         <source>Failed to change the language:
 
 %1
@@ -426,18 +426,18 @@ Stop the checking before exiting.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="695"/>
-        <location filename="mainwindow.cpp" line="711"/>
+        <location filename="mainwindow.cpp" line="705"/>
+        <location filename="mainwindow.cpp" line="721"/>
         <source>Project files (*.cppcheck);;All files(*.*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="697"/>
+        <location filename="mainwindow.cpp" line="707"/>
         <source>Select Project File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="713"/>
+        <location filename="mainwindow.cpp" line="723"/>
         <source>Select Project Filename</source>
         <translation type="unfinished"></translation>
     </message>
@@ -637,36 +637,36 @@ Please select the directory where file is located.</source>
 <context>
     <name>ResultsView</name>
     <message>
+        <location filename="resultsview.cpp" line="170"/>
         <location filename="resultsview.cpp" line="182"/>
-        <location filename="resultsview.cpp" line="194"/>
         <source>Cppcheck</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="183"/>
+        <location filename="resultsview.cpp" line="171"/>
         <source>No errors found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="191"/>
+        <location filename="resultsview.cpp" line="179"/>
         <source>Errors were found, but they are configured to be hidden.
 To toggle what kind of errors are shown, open view menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="240"/>
-        <location filename="resultsview.cpp" line="250"/>
+        <location filename="resultsview.cpp" line="228"/>
+        <location filename="resultsview.cpp" line="238"/>
         <source>Failed to read the report.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="109"/>
+        <location filename="resultsview.cpp" line="97"/>
         <source>No errors found, nothing to save.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="136"/>
-        <location filename="resultsview.cpp" line="146"/>
+        <location filename="resultsview.cpp" line="124"/>
+        <location filename="resultsview.cpp" line="134"/>
         <source>Failed to save the report.</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/gui/cppcheck_en.ts b/gui/cppcheck_en.ts
index cf01bd70f..1aa29f33f 100644
--- a/gui/cppcheck_en.ts
+++ b/gui/cppcheck_en.ts
@@ -143,8 +143,8 @@ kate -l(line) (file)</translation>
         <location filename="main.ui" line="26"/>
         <location filename="mainwindow.cpp" line="221"/>
         <location filename="mainwindow.cpp" line="507"/>
-        <location filename="mainwindow.cpp" line="609"/>
-        <location filename="mainwindow.cpp" line="627"/>
+        <location filename="mainwindow.cpp" line="619"/>
+        <location filename="mainwindow.cpp" line="637"/>
         <source>Cppcheck</source>
         <translation>Cppcheck</translation>
     </message>
@@ -374,37 +374,28 @@ kate -l(line) (file)</translation>
         <translation>No suitable files found to check!</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="503"/>
-        <source>Cannot exit while checking.
-
-Stop the checking before exiting.</source>
-        <translation>Cannot exit while checking.
-
-Stop the checking before exiting.</translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="534"/>
+        <location filename="mainwindow.cpp" line="544"/>
         <source>License</source>
         <translation>License</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="541"/>
+        <location filename="mainwindow.cpp" line="551"/>
         <source>Authors</source>
         <translation>Authors</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="549"/>
+        <location filename="mainwindow.cpp" line="559"/>
         <source>XML files (*.xml);;Text files (*.txt);;CSV files (*.csv)</source>
         <translation>XML files (*.xml);;Text files (*.txt);;CSV files (*.csv)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="551"/>
+        <location filename="mainwindow.cpp" line="561"/>
         <source>Save the report file</source>
         <translation>Save the report file</translation>
     </message>
     <message>
         <location filename="mainwindow.cpp" line="449"/>
-        <location filename="mainwindow.cpp" line="559"/>
+        <location filename="mainwindow.cpp" line="569"/>
         <source>XML files (*.xml)</source>
         <translation>XML files (*.xml)</translation>
     </message>
@@ -414,22 +405,29 @@ Stop the checking before exiting.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="565"/>
+        <location filename="mainwindow.cpp" line="503"/>
+        <source>Checking is running.
+
+Do you want to stop the checking and exit Cppcheck?.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="575"/>
         <source>Text files (*.txt)</source>
         <translation>Text files (*.txt)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="571"/>
+        <location filename="mainwindow.cpp" line="581"/>
         <source>CSV files (*.csv)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="611"/>
+        <location filename="mainwindow.cpp" line="621"/>
         <source>Cppcheck - %1</source>
         <translation>Cppcheck - %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="628"/>
+        <location filename="mainwindow.cpp" line="638"/>
         <source>Failed to change the language:
 
 %1
@@ -443,18 +441,18 @@ Stop the checking before exiting.</translation>
 %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="695"/>
-        <location filename="mainwindow.cpp" line="711"/>
+        <location filename="mainwindow.cpp" line="705"/>
+        <location filename="mainwindow.cpp" line="721"/>
         <source>Project files (*.cppcheck);;All files(*.*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="697"/>
+        <location filename="mainwindow.cpp" line="707"/>
         <source>Select Project File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="713"/>
+        <location filename="mainwindow.cpp" line="723"/>
         <source>Select Project Filename</source>
         <translation type="unfinished"></translation>
     </message>
@@ -656,37 +654,37 @@ Please select the directory where file is located.</source>
 <context>
     <name>ResultsView</name>
     <message>
+        <location filename="resultsview.cpp" line="170"/>
         <location filename="resultsview.cpp" line="182"/>
-        <location filename="resultsview.cpp" line="194"/>
         <source>Cppcheck</source>
         <translation>Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="183"/>
+        <location filename="resultsview.cpp" line="171"/>
         <source>No errors found.</source>
         <translation>No errors found.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="191"/>
+        <location filename="resultsview.cpp" line="179"/>
         <source>Errors were found, but they are configured to be hidden.
 To toggle what kind of errors are shown, open view menu.</source>
         <translation>Errors were found, but they are configured to be hidden.
 To toggle what kind of errors are shown, open view menu.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="240"/>
-        <location filename="resultsview.cpp" line="250"/>
+        <location filename="resultsview.cpp" line="228"/>
+        <location filename="resultsview.cpp" line="238"/>
         <source>Failed to read the report.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="109"/>
+        <location filename="resultsview.cpp" line="97"/>
         <source>No errors found, nothing to save.</source>
         <translation>No errors found, nothing to save.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="136"/>
-        <location filename="resultsview.cpp" line="146"/>
+        <location filename="resultsview.cpp" line="124"/>
+        <location filename="resultsview.cpp" line="134"/>
         <source>Failed to save the report.</source>
         <translation>Failed to save the report.</translation>
     </message>
diff --git a/gui/cppcheck_fi.ts b/gui/cppcheck_fi.ts
index a5c6f69c9..b71567a3d 100644
--- a/gui/cppcheck_fi.ts
+++ b/gui/cppcheck_fi.ts
@@ -145,8 +145,8 @@ kate -l(line) (file)
         <location filename="main.ui" line="26"/>
         <location filename="mainwindow.cpp" line="221"/>
         <location filename="mainwindow.cpp" line="507"/>
-        <location filename="mainwindow.cpp" line="609"/>
-        <location filename="mainwindow.cpp" line="627"/>
+        <location filename="mainwindow.cpp" line="619"/>
+        <location filename="mainwindow.cpp" line="637"/>
         <source>Cppcheck</source>
         <translation>Cppcheck</translation>
     </message>
@@ -376,37 +376,28 @@ kate -l(line) (file)
         <translation>Tarkistettavaksi sopivia tiedostoja ei löytynyt!</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="503"/>
-        <source>Cannot exit while checking.
-
-Stop the checking before exiting.</source>
-        <translation>Ohjelmaa ei voi sammuttaa tarkistuksen ollessa käynnissä.
-
-Lopeta tarkistus ennen ohjelman sammuttamista.</translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="534"/>
+        <location filename="mainwindow.cpp" line="544"/>
         <source>License</source>
         <translation>Lisenssi</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="541"/>
+        <location filename="mainwindow.cpp" line="551"/>
         <source>Authors</source>
         <translation>Tekijät</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="549"/>
+        <location filename="mainwindow.cpp" line="559"/>
         <source>XML files (*.xml);;Text files (*.txt);;CSV files (*.csv)</source>
         <translation>XML-tiedostot (*.xml);;Tekstitiedostot (*.txt);;CSV-tiedostot (*.csv)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="551"/>
+        <location filename="mainwindow.cpp" line="561"/>
         <source>Save the report file</source>
         <translation>Tallenna raportti</translation>
     </message>
     <message>
         <location filename="mainwindow.cpp" line="449"/>
-        <location filename="mainwindow.cpp" line="559"/>
+        <location filename="mainwindow.cpp" line="569"/>
         <source>XML files (*.xml)</source>
         <translation>XML-tiedostot (*xml)</translation>
     </message>
@@ -416,22 +407,29 @@ Lopeta tarkistus ennen ohjelman sammuttamista.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="565"/>
+        <location filename="mainwindow.cpp" line="503"/>
+        <source>Checking is running.
+
+Do you want to stop the checking and exit Cppcheck?.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="575"/>
         <source>Text files (*.txt)</source>
         <translation>Tekstitiedostot (*.txt)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="571"/>
+        <location filename="mainwindow.cpp" line="581"/>
         <source>CSV files (*.csv)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="611"/>
+        <location filename="mainwindow.cpp" line="621"/>
         <source>Cppcheck - %1</source>
         <translation>Cppcheck - %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="628"/>
+        <location filename="mainwindow.cpp" line="638"/>
         <source>Failed to change the language:
 
 %1
@@ -447,18 +445,18 @@ Lopeta tarkistus ennen ohjelman sammuttamista.</translation>
 </translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="695"/>
-        <location filename="mainwindow.cpp" line="711"/>
+        <location filename="mainwindow.cpp" line="705"/>
+        <location filename="mainwindow.cpp" line="721"/>
         <source>Project files (*.cppcheck);;All files(*.*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="697"/>
+        <location filename="mainwindow.cpp" line="707"/>
         <source>Select Project File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="713"/>
+        <location filename="mainwindow.cpp" line="723"/>
         <source>Select Project Filename</source>
         <translation type="unfinished"></translation>
     </message>
@@ -660,37 +658,37 @@ Please select the directory where file is located.</source>
 <context>
     <name>ResultsView</name>
     <message>
+        <location filename="resultsview.cpp" line="170"/>
         <location filename="resultsview.cpp" line="182"/>
-        <location filename="resultsview.cpp" line="194"/>
         <source>Cppcheck</source>
         <translation>Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="183"/>
+        <location filename="resultsview.cpp" line="171"/>
         <source>No errors found.</source>
         <translation>Virheitä ei löytynyt.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="191"/>
+        <location filename="resultsview.cpp" line="179"/>
         <source>Errors were found, but they are configured to be hidden.
 To toggle what kind of errors are shown, open view menu.</source>
         <translation>Virheitä löytyi, mutta asetuksissa kyseiset virheet on määritelty piilotettavaksi.
 Määrittääksesi minkä tyyppisiä virheitä näytetään, avaa näkymä valikko.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="240"/>
-        <location filename="resultsview.cpp" line="250"/>
+        <location filename="resultsview.cpp" line="228"/>
+        <location filename="resultsview.cpp" line="238"/>
         <source>Failed to read the report.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="109"/>
+        <location filename="resultsview.cpp" line="97"/>
         <source>No errors found, nothing to save.</source>
         <translation>Virheitä ei löytynyt, ei mitään tallennettavaa.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="136"/>
-        <location filename="resultsview.cpp" line="146"/>
+        <location filename="resultsview.cpp" line="124"/>
+        <location filename="resultsview.cpp" line="134"/>
         <source>Failed to save the report.</source>
         <translation>Raportin tallentaminen epäonnistui.</translation>
     </message>
diff --git a/gui/cppcheck_nl.ts b/gui/cppcheck_nl.ts
index 9b2c1bee8..552e12cf6 100644
--- a/gui/cppcheck_nl.ts
+++ b/gui/cppcheck_nl.ts
@@ -143,8 +143,8 @@ kate -l(line) (file)</translation>
         <location filename="main.ui" line="26"/>
         <location filename="mainwindow.cpp" line="221"/>
         <location filename="mainwindow.cpp" line="507"/>
-        <location filename="mainwindow.cpp" line="609"/>
-        <location filename="mainwindow.cpp" line="627"/>
+        <location filename="mainwindow.cpp" line="619"/>
+        <location filename="mainwindow.cpp" line="637"/>
         <source>Cppcheck</source>
         <translation>Cppcheck</translation>
     </message>
@@ -374,37 +374,28 @@ kate -l(line) (file)</translation>
         <translation>Geen geschikte bestanden gevonden om te controleren!</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="503"/>
-        <source>Cannot exit while checking.
-
-Stop the checking before exiting.</source>
-        <translation>Kan niet termineren terwijl een controle bezig is.
-
-Stop de controle alvorens te sluiten.</translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="534"/>
+        <location filename="mainwindow.cpp" line="544"/>
         <source>License</source>
         <translation>Licentie</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="541"/>
+        <location filename="mainwindow.cpp" line="551"/>
         <source>Authors</source>
         <translation>Auteurs</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="549"/>
+        <location filename="mainwindow.cpp" line="559"/>
         <source>XML files (*.xml);;Text files (*.txt);;CSV files (*.csv)</source>
         <translation>XML bestanden (*.xml);;Tekst bestanden (*.txt);;CSV bestanden (*.csv)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="551"/>
+        <location filename="mainwindow.cpp" line="561"/>
         <source>Save the report file</source>
         <translation>Rapport opslaan </translation>
     </message>
     <message>
         <location filename="mainwindow.cpp" line="449"/>
-        <location filename="mainwindow.cpp" line="559"/>
+        <location filename="mainwindow.cpp" line="569"/>
         <source>XML files (*.xml)</source>
         <translation>XML bestanden (*.xml)</translation>
     </message>
@@ -414,22 +405,29 @@ Stop de controle alvorens te sluiten.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="565"/>
+        <location filename="mainwindow.cpp" line="503"/>
+        <source>Checking is running.
+
+Do you want to stop the checking and exit Cppcheck?.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="575"/>
         <source>Text files (*.txt)</source>
         <translation>Tekst bestanden (*.txt)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="571"/>
+        <location filename="mainwindow.cpp" line="581"/>
         <source>CSV files (*.csv)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="611"/>
+        <location filename="mainwindow.cpp" line="621"/>
         <source>Cppcheck - %1</source>
         <translation>Cppcheck - %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="628"/>
+        <location filename="mainwindow.cpp" line="638"/>
         <source>Failed to change the language:
 
 %1
@@ -443,18 +441,18 @@ Stop de controle alvorens te sluiten.</translation>
 %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="695"/>
-        <location filename="mainwindow.cpp" line="711"/>
+        <location filename="mainwindow.cpp" line="705"/>
+        <location filename="mainwindow.cpp" line="721"/>
         <source>Project files (*.cppcheck);;All files(*.*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="697"/>
+        <location filename="mainwindow.cpp" line="707"/>
         <source>Select Project File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="713"/>
+        <location filename="mainwindow.cpp" line="723"/>
         <source>Select Project Filename</source>
         <translation type="unfinished"></translation>
     </message>
@@ -656,37 +654,37 @@ Please select the directory where file is located.</source>
 <context>
     <name>ResultsView</name>
     <message>
+        <location filename="resultsview.cpp" line="170"/>
         <location filename="resultsview.cpp" line="182"/>
-        <location filename="resultsview.cpp" line="194"/>
         <source>Cppcheck</source>
         <translation>Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="183"/>
+        <location filename="resultsview.cpp" line="171"/>
         <source>No errors found.</source>
         <translation>Geen fouten gevonden.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="191"/>
+        <location filename="resultsview.cpp" line="179"/>
         <source>Errors were found, but they are configured to be hidden.
 To toggle what kind of errors are shown, open view menu.</source>
         <translation>Fouten werden gevonden, maar volgens de configuratie zijn deze verborgen.
 Gebruik het uitzicht menu om te selecteren welke fouten getoond worden.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="240"/>
-        <location filename="resultsview.cpp" line="250"/>
+        <location filename="resultsview.cpp" line="228"/>
+        <location filename="resultsview.cpp" line="238"/>
         <source>Failed to read the report.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="109"/>
+        <location filename="resultsview.cpp" line="97"/>
         <source>No errors found, nothing to save.</source>
         <translation>Geen fouten gevonden; geen data om op te slaan.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="136"/>
-        <location filename="resultsview.cpp" line="146"/>
+        <location filename="resultsview.cpp" line="124"/>
+        <location filename="resultsview.cpp" line="134"/>
         <source>Failed to save the report.</source>
         <translation>Kon het rapport niet opslaan.</translation>
     </message>
diff --git a/gui/cppcheck_pl.ts b/gui/cppcheck_pl.ts
index 4db1ed994..9921d0b39 100644
--- a/gui/cppcheck_pl.ts
+++ b/gui/cppcheck_pl.ts
@@ -130,8 +130,8 @@ kate -l(line) (file)</oldsource>
         <location filename="main.ui" line="26"/>
         <location filename="mainwindow.cpp" line="221"/>
         <location filename="mainwindow.cpp" line="507"/>
-        <location filename="mainwindow.cpp" line="609"/>
-        <location filename="mainwindow.cpp" line="627"/>
+        <location filename="mainwindow.cpp" line="619"/>
+        <location filename="mainwindow.cpp" line="637"/>
         <source>Cppcheck</source>
         <translation type="unfinished"></translation>
     </message>
@@ -366,60 +366,60 @@ kate -l(line) (file)</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="503"/>
-        <source>Cannot exit while checking.
-
-Stop the checking before exiting.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="534"/>
+        <location filename="mainwindow.cpp" line="544"/>
         <source>License</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="541"/>
+        <location filename="mainwindow.cpp" line="551"/>
         <source>Authors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="549"/>
+        <location filename="mainwindow.cpp" line="559"/>
         <source>XML files (*.xml);;Text files (*.txt);;CSV files (*.csv)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="551"/>
+        <location filename="mainwindow.cpp" line="561"/>
         <source>Save the report file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="713"/>
+        <location filename="mainwindow.cpp" line="723"/>
         <source>Select Project Filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.cpp" line="449"/>
-        <location filename="mainwindow.cpp" line="559"/>
+        <location filename="mainwindow.cpp" line="569"/>
         <source>XML files (*.xml)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="565"/>
+        <location filename="mainwindow.cpp" line="503"/>
+        <source>Checking is running.
+
+Do you want to stop the checking and exit Cppcheck?.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="575"/>
         <source>Text files (*.txt)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="571"/>
+        <location filename="mainwindow.cpp" line="581"/>
         <source>CSV files (*.csv)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="611"/>
+        <location filename="mainwindow.cpp" line="621"/>
         <source>Cppcheck - %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="628"/>
+        <location filename="mainwindow.cpp" line="638"/>
         <source>Failed to change the language:
 
 %1
@@ -428,13 +428,13 @@ Stop the checking before exiting.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="695"/>
-        <location filename="mainwindow.cpp" line="711"/>
+        <location filename="mainwindow.cpp" line="705"/>
+        <location filename="mainwindow.cpp" line="721"/>
         <source>Project files (*.cppcheck);;All files(*.*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="697"/>
+        <location filename="mainwindow.cpp" line="707"/>
         <source>Select Project File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -631,36 +631,36 @@ Please select the directory where file is located.</source>
 <context>
     <name>ResultsView</name>
     <message>
+        <location filename="resultsview.cpp" line="170"/>
         <location filename="resultsview.cpp" line="182"/>
-        <location filename="resultsview.cpp" line="194"/>
         <source>Cppcheck</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="183"/>
+        <location filename="resultsview.cpp" line="171"/>
         <source>No errors found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="191"/>
+        <location filename="resultsview.cpp" line="179"/>
         <source>Errors were found, but they are configured to be hidden.
 To toggle what kind of errors are shown, open view menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="240"/>
-        <location filename="resultsview.cpp" line="250"/>
+        <location filename="resultsview.cpp" line="228"/>
+        <location filename="resultsview.cpp" line="238"/>
         <source>Failed to read the report.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="109"/>
+        <location filename="resultsview.cpp" line="97"/>
         <source>No errors found, nothing to save.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="136"/>
-        <location filename="resultsview.cpp" line="146"/>
+        <location filename="resultsview.cpp" line="124"/>
+        <location filename="resultsview.cpp" line="134"/>
         <source>Failed to save the report.</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/gui/cppcheck_ru.ts b/gui/cppcheck_ru.ts
index 415cd4044..833ba47e8 100644
--- a/gui/cppcheck_ru.ts
+++ b/gui/cppcheck_ru.ts
@@ -133,8 +133,8 @@ kate -l(line) (file)</oldsource>
         <location filename="main.ui" line="26"/>
         <location filename="mainwindow.cpp" line="221"/>
         <location filename="mainwindow.cpp" line="507"/>
-        <location filename="mainwindow.cpp" line="609"/>
-        <location filename="mainwindow.cpp" line="627"/>
+        <location filename="mainwindow.cpp" line="619"/>
+        <location filename="mainwindow.cpp" line="637"/>
         <source>Cppcheck</source>
         <translation>Cppcheck</translation>
     </message>
@@ -364,35 +364,28 @@ kate -l(line) (file)</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="503"/>
-        <source>Cannot exit while checking.
-
-Stop the checking before exiting.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="534"/>
+        <location filename="mainwindow.cpp" line="544"/>
         <source>License</source>
         <translation>Лицензия</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="541"/>
+        <location filename="mainwindow.cpp" line="551"/>
         <source>Authors</source>
         <translation>Авторы</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="549"/>
+        <location filename="mainwindow.cpp" line="559"/>
         <source>XML files (*.xml);;Text files (*.txt);;CSV files (*.csv)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="551"/>
+        <location filename="mainwindow.cpp" line="561"/>
         <source>Save the report file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.cpp" line="449"/>
-        <location filename="mainwindow.cpp" line="559"/>
+        <location filename="mainwindow.cpp" line="569"/>
         <source>XML files (*.xml)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -402,22 +395,29 @@ Stop the checking before exiting.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="565"/>
+        <location filename="mainwindow.cpp" line="503"/>
+        <source>Checking is running.
+
+Do you want to stop the checking and exit Cppcheck?.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="575"/>
         <source>Text files (*.txt)</source>
         <translation>Текстовые файлы (*.txt)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="571"/>
+        <location filename="mainwindow.cpp" line="581"/>
         <source>CSV files (*.csv)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="611"/>
+        <location filename="mainwindow.cpp" line="621"/>
         <source>Cppcheck - %1</source>
         <translation>Cppcheck - %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="628"/>
+        <location filename="mainwindow.cpp" line="638"/>
         <source>Failed to change the language:
 
 %1
@@ -433,18 +433,18 @@ Stop the checking before exiting.</source>
 </translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="695"/>
-        <location filename="mainwindow.cpp" line="711"/>
+        <location filename="mainwindow.cpp" line="705"/>
+        <location filename="mainwindow.cpp" line="721"/>
         <source>Project files (*.cppcheck);;All files(*.*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="697"/>
+        <location filename="mainwindow.cpp" line="707"/>
         <source>Select Project File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="713"/>
+        <location filename="mainwindow.cpp" line="723"/>
         <source>Select Project Filename</source>
         <translation type="unfinished"></translation>
     </message>
@@ -644,36 +644,36 @@ Please select the directory where file is located.</source>
 <context>
     <name>ResultsView</name>
     <message>
+        <location filename="resultsview.cpp" line="170"/>
         <location filename="resultsview.cpp" line="182"/>
-        <location filename="resultsview.cpp" line="194"/>
         <source>Cppcheck</source>
         <translation>Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="183"/>
+        <location filename="resultsview.cpp" line="171"/>
         <source>No errors found.</source>
         <translation>Ошибок не найдено.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="191"/>
+        <location filename="resultsview.cpp" line="179"/>
         <source>Errors were found, but they are configured to be hidden.
 To toggle what kind of errors are shown, open view menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="240"/>
-        <location filename="resultsview.cpp" line="250"/>
+        <location filename="resultsview.cpp" line="228"/>
+        <location filename="resultsview.cpp" line="238"/>
         <source>Failed to read the report.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="109"/>
+        <location filename="resultsview.cpp" line="97"/>
         <source>No errors found, nothing to save.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="136"/>
-        <location filename="resultsview.cpp" line="146"/>
+        <location filename="resultsview.cpp" line="124"/>
+        <location filename="resultsview.cpp" line="134"/>
         <source>Failed to save the report.</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/gui/cppcheck_se.ts b/gui/cppcheck_se.ts
index 523e07c96..5f5ce21cd 100644
--- a/gui/cppcheck_se.ts
+++ b/gui/cppcheck_se.ts
@@ -143,8 +143,8 @@ kate -l(line) (file)</translation>
         <location filename="main.ui" line="26"/>
         <location filename="mainwindow.cpp" line="221"/>
         <location filename="mainwindow.cpp" line="507"/>
-        <location filename="mainwindow.cpp" line="609"/>
-        <location filename="mainwindow.cpp" line="627"/>
+        <location filename="mainwindow.cpp" line="619"/>
+        <location filename="mainwindow.cpp" line="637"/>
         <source>Cppcheck</source>
         <translation>Cppcheck</translation>
     </message>
@@ -375,35 +375,28 @@ kate -l(line) (file)</translation>
         <translation>Inga lämpliga filer hittades!</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="503"/>
-        <source>Cannot exit while checking.
-
-Stop the checking before exiting.</source>
-        <translation>Kan ej avsluta medans check pågår.</translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="534"/>
+        <location filename="mainwindow.cpp" line="544"/>
         <source>License</source>
         <translation>Licens</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="541"/>
+        <location filename="mainwindow.cpp" line="551"/>
         <source>Authors</source>
         <translation>Utvecklare</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="549"/>
+        <location filename="mainwindow.cpp" line="559"/>
         <source>XML files (*.xml);;Text files (*.txt);;CSV files (*.csv)</source>
         <translation>XML filer (*.xml);;Text filer (*.txt);;CSV filer (*.csv)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="551"/>
+        <location filename="mainwindow.cpp" line="561"/>
         <source>Save the report file</source>
         <translation>Spara rapport</translation>
     </message>
     <message>
         <location filename="mainwindow.cpp" line="449"/>
-        <location filename="mainwindow.cpp" line="559"/>
+        <location filename="mainwindow.cpp" line="569"/>
         <source>XML files (*.xml)</source>
         <translation>XML filer (*.xml)</translation>
     </message>
@@ -413,22 +406,29 @@ Stop the checking before exiting.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="565"/>
+        <location filename="mainwindow.cpp" line="503"/>
+        <source>Checking is running.
+
+Do you want to stop the checking and exit Cppcheck?.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="575"/>
         <source>Text files (*.txt)</source>
         <translation>Text filer (*.txt)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="571"/>
+        <location filename="mainwindow.cpp" line="581"/>
         <source>CSV files (*.csv)</source>
         <translation>CSV filer (*.csv)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="611"/>
+        <location filename="mainwindow.cpp" line="621"/>
         <source>Cppcheck - %1</source>
         <translation>Cppcheck - %1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="628"/>
+        <location filename="mainwindow.cpp" line="638"/>
         <source>Failed to change the language:
 
 %1
@@ -444,18 +444,18 @@ Stop the checking before exiting.</source>
 </translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="695"/>
-        <location filename="mainwindow.cpp" line="711"/>
+        <location filename="mainwindow.cpp" line="705"/>
+        <location filename="mainwindow.cpp" line="721"/>
         <source>Project files (*.cppcheck);;All files(*.*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="697"/>
+        <location filename="mainwindow.cpp" line="707"/>
         <source>Select Project File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="713"/>
+        <location filename="mainwindow.cpp" line="723"/>
         <source>Select Project Filename</source>
         <translation type="unfinished"></translation>
     </message>
@@ -657,37 +657,37 @@ Please select the directory where file is located.</source>
 <context>
     <name>ResultsView</name>
     <message>
+        <location filename="resultsview.cpp" line="170"/>
         <location filename="resultsview.cpp" line="182"/>
-        <location filename="resultsview.cpp" line="194"/>
         <source>Cppcheck</source>
         <translation>Cppcheck</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="183"/>
+        <location filename="resultsview.cpp" line="171"/>
         <source>No errors found.</source>
         <translation>Inga fel hittades.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="191"/>
+        <location filename="resultsview.cpp" line="179"/>
         <source>Errors were found, but they are configured to be hidden.
 To toggle what kind of errors are shown, open view menu.</source>
         <translation>Fel hittades, men de visas ej.
 För att ställa in vilka fel som skall visas använd visa menyn.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="240"/>
-        <location filename="resultsview.cpp" line="250"/>
+        <location filename="resultsview.cpp" line="228"/>
+        <location filename="resultsview.cpp" line="238"/>
         <source>Failed to read the report.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="109"/>
+        <location filename="resultsview.cpp" line="97"/>
         <source>No errors found, nothing to save.</source>
         <translation>Inga fel hittades, ingenting att spara.</translation>
     </message>
     <message>
-        <location filename="resultsview.cpp" line="136"/>
-        <location filename="resultsview.cpp" line="146"/>
+        <location filename="resultsview.cpp" line="124"/>
+        <location filename="resultsview.cpp" line="134"/>
         <source>Failed to save the report.</source>
         <translation>Misslyckades med att spara rapporten.</translation>
     </message>
diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
index e4e15e1ef..159327950 100644
--- a/gui/mainwindow.cpp
+++ b/gui/mainwindow.cpp
@@ -500,17 +500,27 @@ void MainWindow::closeEvent(QCloseEvent *event)
     }
     else
     {
-        QString text(tr("Cannot exit while checking.\n\n" \
-                        "Stop the checking before exiting."));
+        QString text(tr("Checking is running.\n\n" \
+                        "Do you want to stop the checking and exit Cppcheck?."));
 
         QMessageBox msg(QMessageBox::Warning,
                         tr("Cppcheck"),
                         text,
-                        QMessageBox::Ok,
+                        QMessageBox::Yes | QMessageBox::No,
                         this);
 
-        msg.exec();
-        event->ignore();
+        msg.setDefaultButton(QMessageBox::No);
+        int rv = msg.exec();
+        if (rv == QMessageBox::Yes)
+        {
+            // This isn't really very clean way to close threads but since the app is
+            // exiting it doesn't matter.
+            mThread->Stop();
+            SaveSettings();
+            event->accept();
+        }
+        else
+            event->ignore();
     }
 }