quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix check_version(), RADIANT_MAJOR_VERSION was ignored

Browse Source
This commit is contained in:
Garux 2024-01-29 17:27:24 +06:00
parent 3e34d0eddc
commit 6995ef0eb4
1 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
radiant/main.cpp
View File

@ -279,28 +279,17 @@ bool check_version(){
// let's leave it disabled in debug mode in any case // let's leave it disabled in debug mode in any case
// http://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=431 // http://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=431
#ifndef _DEBUG #ifndef _DEBUG
#define CHECK_VERSION
#endif
#ifdef CHECK_VERSION
// locate and open RADIANT_MAJOR and RADIANT_MINOR // locate and open RADIANT_MAJOR and RADIANT_MINOR
bool bVerIsGood = true; if ( !( check_version_file( StringStream( AppPath_get(), "RADIANT_MAJOR" ), RADIANT_MAJOR_VERSION )
{ && check_version_file( StringStream( AppPath_get(), "RADIANT_MINOR" ), RADIANT_MINOR_VERSION ) ) ) {
bVerIsGood = check_version_file( StringStream( AppPath_get(), "RADIANT_MAJOR" ), RADIANT_MAJOR_VERSION );
}
{
bVerIsGood = check_version_file( StringStream( AppPath_get(), "RADIANT_MINOR" ), RADIANT_MINOR_VERSION );
}
if ( !bVerIsGood ) {
const auto msg = StringStream( const auto msg = StringStream(
"This editor binary (" RADIANT_VERSION ") doesn't match what the latest setup has configured in this directory\n" "This editor binary (" RADIANT_VERSION ") doesn't match what the latest setup has configured in this directory\n"
"Make sure you run the right/latest editor binary you installed\n", AppPath_get() ); "Make sure you run the right/latest editor binary you installed\n", AppPath_get() );
qt_MessageBox( 0, msg, "Radiant" ); qt_MessageBox( 0, msg, "Radiant" );
return false;
} }
return bVerIsGood;
#else
return true;
#endif #endif
return true;
} }
void create_global_pid(){ void create_global_pid(){