CodeCow/Notepad3
1
0
Fork 0
mirror of https://github.com/rizonesoft/Notepad3.git synced 2026-06-14 21:09:05 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #3333 from RaiKoHoff/Dev_RC1

Browse Source 
Minor bug fixes
This commit is contained in:
Rainer Kottenhoff 2021-04-16 10:13:54 +02:00 committed by GitHub
commit 06650d9d12
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Config/Config.cpp
View File

@ -2157,15 +2157,12 @@ bool SaveAllSettings(bool bForceSaveSettings)
}
}
Style_ToIniSection(bForceSaveSettings);
Style_FileExtToIniSection(bForceSaveSettings);
if (GetModeThemeIndex() == 1) {
Style_SaveSettings(bForceSaveSettings);
}
ok = CloseSettingsFile(true, bOpenedByMe); // reset/clear cache
// separate INI files for Style-Themes
// maybe separate INI files for Style-Themes
if (GetModeThemeIndex() >= 2) {
Style_SaveSettings(bForceSaveSettings);
}

3
src/Notepad3.c
View File

@ -10358,6 +10358,9 @@ bool FileSave(bool bSaveAlways, bool bAsk, bool bSaveAs, bool bSaveCopy, bool bP
if (SaveFileDlg(Globals.hwndMain, tchFile, COUNTOF(tchFile), StrIsNotEmpty(tchInitialDir) ? tchInitialDir : NULL)) {
if (!bSaveCopy) {
if (bSaveAs) {
SaveAllSettings(false); // session on old file ends, save side-by-side settings
}
InstallFileWatching(false);
}
fSuccess = FileIO(false, tchFile, &fioStatus, true, true, false, true, bSaveCopy, bPreserveTimeStamp);