69be23c5f6
Instead of just checking if the new version started, make sure it is able to write its IPC key to a file and then use the key to connect to the process.
56 lines
964 B
C++
56 lines
964 B
C++
#include "MultiMC.h"
|
|
#include "MainWindow.h"
|
|
#include "LaunchController.h"
|
|
#include <InstanceList.h>
|
|
#include <QDebug>
|
|
|
|
// #define BREAK_INFINITE_LOOP
|
|
// #define BREAK_EXCEPTION
|
|
// #define BREAK_RETURN
|
|
|
|
#ifdef BREAK_INFINITE_LOOP
|
|
#include <thread>
|
|
#include <chrono>
|
|
#endif
|
|
|
|
int main(int argc, char *argv[])
|
|
{
|
|
#ifdef BREAK_INFINITE_LOOP
|
|
while(true)
|
|
{
|
|
std::this_thread::sleep_for(std::chrono::milliseconds(250));
|
|
}
|
|
#endif
|
|
#ifdef BREAK_EXCEPTION
|
|
throw 42;
|
|
#endif
|
|
#ifdef BREAK_RETURN
|
|
return 42;
|
|
#endif
|
|
|
|
// initialize Qt
|
|
MultiMC app(argc, argv);
|
|
|
|
switch (app.status())
|
|
{
|
|
case MultiMC::Initialized:
|
|
{
|
|
Q_INIT_RESOURCE(multimc);
|
|
Q_INIT_RESOURCE(backgrounds);
|
|
Q_INIT_RESOURCE(versions);
|
|
|
|
Q_INIT_RESOURCE(pe_dark);
|
|
Q_INIT_RESOURCE(pe_light);
|
|
Q_INIT_RESOURCE(pe_blue);
|
|
Q_INIT_RESOURCE(pe_colored);
|
|
Q_INIT_RESOURCE(OSX);
|
|
Q_INIT_RESOURCE(iOS);
|
|
return app.exec();
|
|
}
|
|
case MultiMC::Failed:
|
|
return 1;
|
|
case MultiMC::Succeeded:
|
|
return 0;
|
|
}
|
|
}
|