diff options
| author | Petr Mrázek <peterix@gmail.com> | 2013-08-12 00:39:19 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2013-08-12 00:39:19 +0200 |
| commit | ff33d4a1a48abf1442cde77c2253f071d0870d50 (patch) | |
| tree | 7846f144b2ee2e24574745847c0f921677021d73 /backend/BaseInstance.cpp | |
| parent | 7e78a422e8bb22572706b7fadb58fc45e7b8a7db (diff) | |
| download | MultiMC-ff33d4a1a48abf1442cde77c2253f071d0870d50.tar MultiMC-ff33d4a1a48abf1442cde77c2253f071d0870d50.tar.gz MultiMC-ff33d4a1a48abf1442cde77c2253f071d0870d50.tar.lz MultiMC-ff33d4a1a48abf1442cde77c2253f071d0870d50.tar.xz MultiMC-ff33d4a1a48abf1442cde77c2253f071d0870d50.zip | |
OneSix instances now have a minecraft folder inside.
Also, the main instance view was expanded with helpful key events:
F2 for rename, F5 for refresh, Enter for start instance, Delete for...
Diffstat (limited to 'backend/BaseInstance.cpp')
| -rw-r--r-- | backend/BaseInstance.cpp | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/backend/BaseInstance.cpp b/backend/BaseInstance.cpp index d94f3de9..951b403a 100644 --- a/backend/BaseInstance.cpp +++ b/backend/BaseInstance.cpp @@ -75,7 +75,7 @@ BaseInstance::BaseInstance( BaseInstancePrivate* d_in, QString BaseInstance::id() const { - return QFileInfo(rootDir()).fileName(); + return QFileInfo(instanceRoot()).fileName(); } QString BaseInstance::instanceType() const @@ -85,12 +85,23 @@ QString BaseInstance::instanceType() const } -QString BaseInstance::rootDir() const +QString BaseInstance::instanceRoot() const { I_D(BaseInstance); return d->m_rootDir; } +QString BaseInstance::minecraftRoot() const +{ + QFileInfo mcDir(PathCombine(instanceRoot(), "minecraft")); + QFileInfo dotMCDir(PathCombine(instanceRoot(), ".minecraft")); + + if (dotMCDir.exists() && !mcDir.exists()) + return dotMCDir.filePath(); + else + return mcDir.filePath(); +} + InstanceList *BaseInstance::instList() const { if (parent()->inherits("InstanceList")) |