From e08e566e190bf731006f3fc805c41fd24bfa0e74 Mon Sep 17 00:00:00 2001 From: Don Ho Date: Thu, 23 Aug 2012 22:43:07 +0000 Subject: [PATCH] [BUG_FiXED] Fix config.xml 0 length bug after Windows' update (with reboot). git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@943 f5eea248-9336-0410-98b8-ebc06183d4e3 --- PowerEditor/src/NppBigSwitch.cpp | 15 ++++++++++----- PowerEditor/src/Parameters.cpp | 1 - PowerEditor/src/Parameters.h | 4 ++++ 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/PowerEditor/src/NppBigSwitch.cpp b/PowerEditor/src/NppBigSwitch.cpp index 1e385930d..3ea573479 100644 --- a/PowerEditor/src/NppBigSwitch.cpp +++ b/PowerEditor/src/NppBigSwitch.cpp @@ -1448,12 +1448,17 @@ LRESULT Notepad_plus::process(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lPa scnN.nmhdr.idFrom = 0; _pluginsManager.notify(&scnN); - saveFindHistory(); + // + // saving config.xml + // + saveFindHistory(); //writeFindHistory + _lastRecentFileList.saveLRFL(); //writeRecentFileHistorySettings, writeHistory + saveScintillaParams(); //writeScintillaParams + saveGUIParams(); //writeGUIParams + saveProjectPanelsParams(); //writeProjectPanelsSettings + pNppParam->saveConfig_xml(); + - _lastRecentFileList.saveLRFL(); - saveScintillaParams(); - saveGUIParams(); - saveProjectPanelsParams(); saveUserDefineLangs(); saveShortcuts(); if (nppgui._rememberLastSession && _rememberThisSession) diff --git a/PowerEditor/src/Parameters.cpp b/PowerEditor/src/Parameters.cpp index 0b800a27a..30d5240a8 100644 --- a/PowerEditor/src/Parameters.cpp +++ b/PowerEditor/src/Parameters.cpp @@ -1131,7 +1131,6 @@ void NppParameters::destroyInstance() if (_pXmlUserDoc != NULL) { - _pXmlUserDoc->SaveFile(); delete _pXmlUserDoc; } if (_pXmlUserStylerDoc) diff --git a/PowerEditor/src/Parameters.h b/PowerEditor/src/Parameters.h index 6f8f5f497..e9361d8ab 100644 --- a/PowerEditor/src/Parameters.h +++ b/PowerEditor/src/Parameters.h @@ -1446,6 +1446,10 @@ public: return _isLocal; }; + void saveConfig_xml() { + _pXmlUserDoc->SaveFile(); + }; + private: NppParameters(); ~NppParameters();