diff --git a/PowerEditor/bin/change.log b/PowerEditor/bin/change.log index 2b28e0a88..cfa130836 100644 --- a/PowerEditor/bin/change.log +++ b/PowerEditor/bin/change.log @@ -15,7 +15,6 @@ Notepad++ v5.4.4 fixed bugs (from v5.4.3) : 13. Fix the bug that Notepad++ does not show on while it is minimized and its file is modified from outside. - Notepad++ v5.4.3 fixed bugs (from v5.4.2) : 1. Fix clickable link styling bug. diff --git a/PowerEditor/bin/npp.pdb b/PowerEditor/bin/npp.pdb index 5bc1ba0f5..256e30304 100644 Binary files a/PowerEditor/bin/npp.pdb and b/PowerEditor/bin/npp.pdb differ diff --git a/PowerEditor/src/Notepad_plus.cpp b/PowerEditor/src/Notepad_plus.cpp index fe2ba9f0e..afca160c2 100644 --- a/PowerEditor/src/Notepad_plus.cpp +++ b/PowerEditor/src/Notepad_plus.cpp @@ -8530,8 +8530,6 @@ LRESULT Notepad_plus::runProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lPa { _activeAppInf._isActivated = true; checkModifiedDocument(); - if (::IsIconic(_hSelf)) - ::ShowWindow(_hSelf, SW_RESTORE); return FALSE; } } @@ -9718,6 +9716,8 @@ void Notepad_plus::notifyBufferChanged(Buffer * buffer, int mask) { int curPos = _pEditView->execute(SCI_GETCURRENTPOS); ::PostMessage(_pEditView->getHSelf(), WM_LBUTTONUP, 0, 0); ::PostMessage(_pEditView->getHSelf(), SCI_SETSEL, curPos, curPos); + if (::IsIconic(_hSelf)) + ::ShowWindow(_hSelf, SW_RESTORE); } } diff --git a/PowerEditor/src/ScitillaComponent/Buffer.cpp b/PowerEditor/src/ScitillaComponent/Buffer.cpp index b58972cc2..3690d600c 100644 --- a/PowerEditor/src/ScitillaComponent/Buffer.cpp +++ b/PowerEditor/src/ScitillaComponent/Buffer.cpp @@ -194,10 +194,8 @@ bool Buffer::checkFileState() { //returns true if the status has been changed (i doNotify(mask); return true; } - return false; } - return false; } @@ -370,7 +368,7 @@ void FileManager::init(Notepad_plus * pNotepadPlus, ScintillaEditView * pscratch void FileManager::checkFilesystemChanges() { for(size_t i = 0; i < _nrBufs; i++) { - if (_buffers[i]->checkFileState()){} //something has changed. Triggers update automatically + _buffers[i]->checkFileState(); //something has changed. Triggers update automatically } }