Issue #140: remove a tab section from tabs.ini within RestoreTabs(), …

…if its file does not exist
HeidiSQL · Apr 10, 2019 · f4c1503 · f4c1503
1 parent 430ea3b
commit f4c1503
Showing 1 changed file with 19 additions and 9 deletions.
diff --git a/source/main.pas b/source/main.pas
@@ -2203,16 +2203,26 @@ procedure TMainForm.RestoreTabs;
       Filename := TabsIni.ReadString(Section, 'Filename', '');
       BackupFilename := TabsIni.ReadString(Section, 'BackupFilename', '');
       if not BackupFilename.IsEmpty then begin
-        Tab := ActiveOrEmptyQueryTab(False);
-        Tab.Uid := Section;
-        Tab.LoadContents(BackupFilename, True, TEncoding.UTF8);
-        Tab.MemoFilename := Filename;
-        Tab.Memo.Modified := True;
+        if FileExists(BackupFilename) then begin
+          Tab := ActiveOrEmptyQueryTab(False);
+          Tab.Uid := Section;
+          Tab.LoadContents(BackupFilename, True, TEncoding.UTF8);
+          Tab.MemoFilename := Filename;
+          Tab.Memo.Modified := True;
+        end else begin
+          // Remove ini item if file is gone
+          TabsIni.EraseSection(Section);
+        end;
       end else if not Filename.IsEmpty then begin
-        Tab := ActiveOrEmptyQueryTab(False);
-        Tab.Uid := Section;
-        Tab.LoadContents(Filename, True, nil);
-        Tab.MemoFilename := Filename;
+        if FileExists(Filename) then begin
+          Tab := ActiveOrEmptyQueryTab(False);
+          Tab.Uid := Section;
+          Tab.LoadContents(Filename, True, nil);
+          Tab.MemoFilename := Filename;
+        end else begin
+          // Remove ini item if file is gone
+          TabsIni.EraseSection(Section);
+        end;
       end;
     end;
     Sections.Free;