CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/peterix/MultiMC5

Browse Source 
Conflicts:
	CMakeLists.txt
	main.cpp
This commit is contained in:
Andrew
2013-02-25 13:31:37 -06:00
parent 498225debd 4fd5bdb01b
commit 23474da175
25 changed files with 2196 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libinstance/include/instance.h
View File

@ -305,4 +305,7 @@ private:
QString m_rootDir;
};
// pointer for lazy people
typedef QSharedPointer<Instance> InstancePtr;
#endif // INSTANCE_H

10
libinstance/src/instance.cpp
View File

@ -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
@ -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