diff options
| author | Orochimarufan <orochimarufan.x3@gmail.com> | 2013-02-22 16:17:31 +0100 |
|---|---|---|
| committer | Orochimarufan <orochimarufan.x3@gmail.com> | 2013-02-22 16:17:31 +0100 |
| commit | 9f174ad4e7853b5864d7478ce97d7afa75d76636 (patch) | |
| tree | 7a0600776a5266a940ee25d1fe2b6e89c99957fb /libinstance | |
| parent | eda7b6cf9d3c5d40a211c72bc2032f2b68baf87f (diff) | |
| download | PrismLauncher-9f174ad4e7853b5864d7478ce97d7afa75d76636.tar.gz PrismLauncher-9f174ad4e7853b5864d7478ce97d7afa75d76636.tar.bz2 PrismLauncher-9f174ad4e7853b5864d7478ce97d7afa75d76636.zip | |
Implement Instance launching
Use --launch <instance> to test
Diffstat (limited to 'libinstance')
| -rw-r--r-- | libinstance/include/instance.h | 3 | ||||
| -rw-r--r-- | libinstance/src/instance.cpp | 8 |
2 files changed, 5 insertions, 6 deletions
diff --git a/libinstance/include/instance.h b/libinstance/include/instance.h index 7b3c001d..995b88d8 100644 --- a/libinstance/include/instance.h +++ b/libinstance/include/instance.h @@ -339,4 +339,7 @@ private: QString m_rootDir; }; +// pointer for lazy people +typedef QSharedPointer<Instance> InstancePtr; + #endif // INSTANCE_H diff --git a/libinstance/src/instance.cpp b/libinstance/src/instance.cpp index c79c0213..c10286b6 100644 --- a/libinstance/src/instance.cpp +++ b/libinstance/src/instance.cpp @@ -50,13 +50,9 @@ QString Instance::minecraftDir() const QFileInfo dotMCDir(PathCombine(rootDir(), ".minecraft")); if (dotMCDir.exists() && !mcDir.exists()) - { - return dotMCDir.path(); - } + return dotMCDir.filePath(); else - { - return mcDir.path(); - } + return mcDir.filePath(); } QString Instance::binDir() const |