External/UltimMC_Launcher
1
0
Fork 0
mirror of https://github.com/UltimMC/Launcher.git synced 2025-10-04 09:08:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix_json_version' into integration_json_and_tools

Browse Source 
Conflicts:
	logic/OneSixInstance.cpp
	logic/OneSixVersionBuilder.cpp

Some fixage. Yay for conflicts.
This commit is contained in:
Petr Mrázek
2014-02-24 02:35:01 +01:00
parent f7c97efcf3 0b56b5efaf
commit 49dc9695f5
10 changed files with 224 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
logic/OneSixInstance.cpp
View File

@@ -325,8 +325,15 @@ bool OneSixInstance::reloadVersion(QWidget *widgetParent)
{
ret = d->vanillaVersion->reload(widgetParent, true, externalPatches());
}
emit versionReloaded();
if (ret)
{
setFlags(flags() & ~VersionBrokenFlag);
emit versionReloaded();
}
else
{
setFlags(flags() | VersionBrokenFlag);
}
return ret;
}
@@ -362,8 +369,14 @@ QString OneSixInstance::defaultCustomBaseJar() const
bool OneSixInstance::menuActionEnabled(QString action_name) const
{
if (action_name == "actionChangeInstLWJGLVersion")
if (flags() & VersionBrokenFlag)
{
return false;
}
if (action_name == "actionChangeInstLWJGLVersion")
{
return false;
}
return true;
}
@@ -372,7 +385,11 @@ QString OneSixInstance::getStatusbarDescription()
QString descr = "OneSix : " + intendedVersionId();
if (versionIsCustom())
{
descr + " (custom)";
descr += " (custom)";
}
if (flags() & VersionBrokenFlag)
{
descr += " (broken)";
}
return descr;
}