P35124786
/
notepad--
mirror of https://gitee.com/cxasm/notepad--.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

!17 解决linux构建失败问题 

Merge pull request !17 from coconi/fix_linux_build_fail
This commit is contained in:
爬山虎 2023-02-03 02:53:42 +00:00 committed by Gitee
parent 7231a7365d fcfb3a75a6
commit b9b208385e
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cceditor/ccnotepad.cpp
View File

@ -8770,7 +8770,7 @@ void CCNotePad::slot_formatXml()
void CCNotePad::slot_formatJson() void CCNotePad::slot_formatJson()
{ {
ScintillaEditView* _pEditView = getCurEditView(); ScintillaEditView* _pEditView = getCurEditView();
if (_pEditView == nullptr && _pEditView->isReadOnly()) if (_pEditView == nullptr || _pEditView->isReadOnly())
{ {
return; return;
} }

2
src/main.cpp
View File

@ -31,9 +31,9 @@
#include <qt_windows.h> #include <qt_windows.h>
const ULONG_PTR CUSTOM_TYPE = 10000; const ULONG_PTR CUSTOM_TYPE = 10000;
const ULONG_PTR OPEN_NOTEPAD_TYPE = 10001; const ULONG_PTR OPEN_NOTEPAD_TYPE = 10001;
bool s_isAdminAuth = false;
#endif #endif
bool s_isAdminAuth = false;
const QString c_strTitle = "Ndd"; const QString c_strTitle = "Ndd";