mc-in-work/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2026-06-29 09:59:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

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
commit 23474da175
25 changed files with 2196 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

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