0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Petr Mrázek 2013-11-11 04:47:09 +01:00
commit 997054a535
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gui/ConsoleWindow.ui
View File

@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>600</width>
<height>400</height>
<width>610</width>
<height>391</height>
</rect>
</property>
<property name="windowTitle">
@ -23,6 +23,9 @@
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>6</number>
</property>
<item>
<widget class="QPlainTextEdit" name="text">
<property name="font">
@ -49,6 +52,12 @@
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="leftMargin">
<number>6</number>
</property>
<property name="rightMargin">
<number>6</number>
</property>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
@ -65,14 +74,14 @@
<item>
<widget class="QPushButton" name="btnKillMinecraft">
<property name="text">
<string>Kill Minecraft</string>
<string>&amp;Kill Minecraft</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="closeButton">
<property name="text">
<string>Close</string>
<string>&amp;Close</string>
</property>
</widget>
</item>
@ -80,6 +89,11 @@
</item>
</layout>
</widget>
<tabstops>
<tabstop>text</tabstop>
<tabstop>closeButton</tabstop>
<tabstop>btnKillMinecraft</tabstop>
</tabstops>
<resources/>
<connections/>
</ui>

7
logic/LegacyUpdate.cpp
View File

@ -40,7 +40,7 @@ void LegacyUpdate::lwjglStart()
LegacyInstance *inst = (LegacyInstance *)m_inst;
lwjglVersion = inst->lwjglVersion();
lwjglTargetPath = PathCombine("lwjgl", lwjglVersion);
lwjglTargetPath = PathCombine(MMC->settings()->get("LWJGLDir").toString(), lwjglVersion);
lwjglNativesPath = PathCombine(lwjglTargetPath, "natives");
// if the 'done' file exists, we don't have to download this again
@ -361,7 +361,10 @@ void LegacyUpdate::ModTheJar()
setStatus("Installing mods - backing up minecraft.jar...");
if (!baseJar.exists() && !QFile::copy(runnableJar.filePath(), baseJar.filePath()))
{
emitFailed("Failed to back up minecraft.jar");
emitFailed("It seems both the active and base jar are gone. A fresh base jar will be used on next run.");
inst->setShouldRebuild(true);
inst->setShouldUpdate(true);
inst->setShouldUseCustomBaseJar(false);
return;
}
}