Disable window titles and isons again, windows build fixes

This commit is contained in:
Petr Mrázek 2014-05-11 16:43:20 +02:00
parent ad1f2c530c
commit e993adaf44
4 changed files with 7 additions and 5 deletions

View File

@ -218,6 +218,7 @@ public class OneSixLauncher implements Launcher
e.printStackTrace(System.err);
return -1;
}
/*
final java.nio.ByteBuffer[] icons = IconLoader.load("icon.png");
new Thread() {
public void run() {
@ -263,7 +264,7 @@ public class OneSixLauncher implements Launcher
}
}
.start();
*/
// init params for the main method to chomp on.
String[] paramsArray = mcparams.toArray(new String[mcparams.size()]);
try

View File

@ -1,5 +1,6 @@
#include "MMCJson.h"
#include <QString>
#include <QStringList>
#include <math.h>
bool MMCJson::ensureBoolean(const QJsonValue val, const QString what)

View File

@ -298,8 +298,8 @@ void OneSixUpdate::jarlibFinished()
QString fullJarPath = entry->getFullPath();
QString fullStrippedJarPath = entryStripped->getFullPath();
if (entry->md5sum != jarHashOnEntry || !QFileInfo::exists(fullStrippedJarPath))
QFileInfo finfo(fullStrippedJarPath);
if (entry->md5sum != jarHashOnEntry || !finfo.exists())
{
stripJar(fullJarPath, fullStrippedJarPath);
}
@ -500,4 +500,4 @@ void OneSixUpdate::fmllibsFailed()
{
emitFailed("Game update failed: it was impossible to fetch the required FML libraries.");
return;
}
}

View File

@ -68,7 +68,7 @@ bool VersionFinal::preremove(VersionPatchPtr patch)
{
QString fullpath =PathCombine(m_instance->jarModsDir(), jarmod->name);
QFileInfo finfo (fullpath);
if(finfo.exists(fullpath))
if(finfo.exists())
ok &= QFile::remove(fullpath);
}
return ok;