mirror of https://gitee.com/cxasm/notepad--.git
!17 解决linux构建失败问题
Merge pull request !17 from coconi/fix_linux_build_fail
This commit is contained in:
commit
b9b208385e
|
@ -8770,7 +8770,7 @@ void CCNotePad::slot_formatXml()
|
|||
void CCNotePad::slot_formatJson()
|
||||
{
|
||||
ScintillaEditView* _pEditView = getCurEditView();
|
||||
if (_pEditView == nullptr && _pEditView->isReadOnly())
|
||||
if (_pEditView == nullptr || _pEditView->isReadOnly())
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
|
|
@ -31,9 +31,9 @@
|
|||
#include <qt_windows.h>
|
||||
const ULONG_PTR CUSTOM_TYPE = 10000;
|
||||
const ULONG_PTR OPEN_NOTEPAD_TYPE = 10001;
|
||||
bool s_isAdminAuth = false;
|
||||
#endif
|
||||
|
||||
bool s_isAdminAuth = false;
|
||||
const QString c_strTitle = "Ndd";
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue