Skip to content

Commit

Permalink
Merge pull request #1588 from zenustech/zeno2-fixbug
Browse files Browse the repository at this point in the history
update ver.
  • Loading branch information
zhouhang95 authored Dec 7, 2023
2 parents 6c4fa7e + 896bd8b commit 5269aa4
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
8 changes: 4 additions & 4 deletions ui/zenoedit/zenoedit.rc
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ END
//

VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,2,0,1205
PRODUCTVERSION 1,2,0,1205
FILEVERSION 1,2,1,1205
PRODUCTVERSION 1,2,1,1205
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
Expand All @@ -66,12 +66,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "ZENUSTECH"
VALUE "FileDescription", "Zeno Editor"
VALUE "FileVersion", "1.2.0.1205"
VALUE "FileVersion", "1.2.1.1205"
VALUE "InternalName", "zenoedit.rc"
VALUE "LegalCopyright", "Copyright (C) 2023"
VALUE "OriginalFilename", "zenoedit.rc"
VALUE "ProductName", "Zeno"
VALUE "ProductVersion", "1.2.0.1205"
VALUE "ProductVersion", "1.2.1.1205"
END
END
BLOCK "VarFileInfo"
Expand Down
2 changes: 2 additions & 0 deletions ui/zenoedit/zenomainwindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1949,6 +1949,7 @@ void ZenoMainWindow::save()
if (!pModel)
return;

/*
if (pModel->hasNotDescNode())
{
int flag = QMessageBox::question(this, "",
Expand All @@ -1962,6 +1963,7 @@ void ZenoMainWindow::save()
saveAs();
return;
}
*/

zenoio::ZSG_VERSION ver = pModel->ioVersion();
if (zenoio::VER_2 == ver)
Expand Down

0 comments on commit 5269aa4

Please sign in to comment.