From 9f174ad4e7853b5864d7478ce97d7afa75d76636 Mon Sep 17 00:00:00 2001 From: Orochimarufan Date: Fri, 22 Feb 2013 16:17:31 +0100 Subject: Implement Instance launching Use --launch to test --- libinstance/include/instance.h | 3 +++ libinstance/src/instance.cpp | 8 ++------ 2 files changed, 5 insertions(+), 6 deletions(-) (limited to 'libinstance') 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 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 -- cgit v1.2.3 From 4fd5bdb01b27c99f16c9acf3c7ac13c7ea719800 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sat, 23 Feb 2013 00:56:17 +0100 Subject: *Full* folder name is the instance ID, not just the first part. --- libinstance/src/instance.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libinstance') diff --git a/libinstance/src/instance.cpp b/libinstance/src/instance.cpp index c10286b6..eb9fdff5 100644 --- a/libinstance/src/instance.cpp +++ b/libinstance/src/instance.cpp @@ -28,7 +28,7 @@ Instance::Instance(const QString &rootDir, QObject *parent) : QString Instance::id() const { - return QFileInfo(rootDir()).baseName(); + return QFileInfo(rootDir()).fileName(); } QString Instance::rootDir() const -- cgit v1.2.3