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

GH-1053 cleanup

Browse Source
This commit is contained in:
Petr Mrázek 2015-07-05 02:47:22 +02:00
parent 5f41886d76
commit 5133b0f34f
3 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
application/LaunchController.cpp
View File

@ -162,8 +162,6 @@ void LaunchController::launchInstance()
return; return;
} }
m_launcher->setProfiler(m_profiler);
if(m_parentWidget) if(m_parentWidget)
{ {
m_parentWidget->hide(); m_parentWidget->hide();
@ -179,22 +177,20 @@ void LaunchController::launchInstance()
void LaunchController::readyForLaunch() void LaunchController::readyForLaunch()
{ {
auto profiler = m_launcher->getProfiler(); if (!m_profiler)
if (!profiler)
{ {
m_launcher->launch(); m_launcher->launch();
return; return;
} }
QString error; QString error;
if (!profiler->check(&error)) if (!m_profiler->check(&error))
{ {
m_launcher->abort(); m_launcher->abort();
QMessageBox::critical(m_parentWidget, tr("Error"), tr("Couldn't start profiler: %1").arg(error)); QMessageBox::critical(m_parentWidget, tr("Error"), tr("Couldn't start profiler: %1").arg(error));
return; return;
} }
BaseProfiler *profilerInstance = profiler->createProfiler(m_launcher->instance(), this); BaseProfiler *profilerInstance = m_profiler->createProfiler(m_launcher->instance(), this);
connect(profilerInstance, &BaseProfiler::readyToLaunch, [this](const QString & message) connect(profilerInstance, &BaseProfiler::readyToLaunch, [this](const QString & message)
{ {

3
application/MainWindow.cpp
View File

@ -377,11 +377,8 @@ namespace Ui {
#include "minecraft/SkinUtils.h" #include "minecraft/SkinUtils.h"
#include "resources/Resource.h" #include "resources/Resource.h"
//#include "minecraft/LegacyInstance.h"
#include <updater/UpdateChecker.h> #include <updater/UpdateChecker.h>
#include <notifications/NotificationChecker.h> #include <notifications/NotificationChecker.h>
#include <tasks/ThreadTask.h>
#include <net/CacheDownload.h> #include <net/CacheDownload.h>
#include "tools/BaseProfiler.h" #include "tools/BaseProfiler.h"

10
logic/BaseLauncher.h
View File

@ -56,16 +56,6 @@ public: /* methods */
void setWorkdir(QString path); void setWorkdir(QString path);
BaseProfilerFactory * getProfiler()
{
return m_profiler;
}
void setProfiler(BaseProfilerFactory * profiler)
{
m_profiler = profiler;
}
void killProcess(); void killProcess();
qint64 pid(); qint64 pid();