aboutsummaryrefslogtreecommitdiff
path: root/logic/OneSixInstance.cpp
diff options
context:
space:
mode:
authorSky <git@bunnies.cc>2013-10-07 08:02:59 -0700
committerSky <git@bunnies.cc>2013-10-07 08:02:59 -0700
commit0bf8d9df5cc102fcec496ba3c5cf15477e726516 (patch)
tree47a22f0353953061a532f103c9d9a92a18a427f9 /logic/OneSixInstance.cpp
parentd5e4802adef575d1d2d20a3e6e5addd4b5f4d2ca (diff)
parentb30a97d4c9315e482341ec863dc5722bf78c4631 (diff)
downloadPrismLauncher-0bf8d9df5cc102fcec496ba3c5cf15477e726516.tar.gz
PrismLauncher-0bf8d9df5cc102fcec496ba3c5cf15477e726516.tar.bz2
PrismLauncher-0bf8d9df5cc102fcec496ba3c5cf15477e726516.zip
Merge pull request #3 from Drayshak/develop
Fix window size setting for 1.6+, improve Windows Java detection
Diffstat (limited to 'logic/OneSixInstance.cpp')
-rw-r--r--logic/OneSixInstance.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/logic/OneSixInstance.cpp b/logic/OneSixInstance.cpp
index c5d546a3..a2a6bf17 100644
--- a/logic/OneSixInstance.cpp
+++ b/logic/OneSixInstance.cpp
@@ -143,6 +143,10 @@ MinecraftProcess *OneSixInstance::prepareForLaunch(LoginResponse response)
args << version->mainClass;
args.append(processMinecraftArgs(response));
+ // Set the width and height for 1.6 instances
+ args << QString("--width") << settings().get("MinecraftWinWidth").toString();
+ args << QString("--height") << settings().get("MinecraftWinHeight").toString();
+
// create the process and set its parameters
MinecraftProcess *proc = new MinecraftProcess(this);
proc->setMinecraftArguments(args);