Fix version file problems, fix console window not being destroyed
This commit is contained in:
		@@ -55,6 +55,7 @@ ConsoleWindow::ConsoleWindow(MinecraftProcess *mcproc, QWidget *parent)
 | 
			
		||||
	: QMainWindow(parent), m_proc(mcproc)
 | 
			
		||||
{
 | 
			
		||||
	MultiMCPlatform::fixWM_CLASS(this);
 | 
			
		||||
	setAttribute(Qt::WA_DeleteOnClose);
 | 
			
		||||
 | 
			
		||||
	auto instance = m_proc->instance();
 | 
			
		||||
	auto icon = MMC->icons()->getIcon(instance->iconKey());
 | 
			
		||||
@@ -263,3 +264,7 @@ void ConsoleWindow::onLaunchFailed(InstancePtr instance)
 | 
			
		||||
	if (!isVisible())
 | 
			
		||||
		show();
 | 
			
		||||
}
 | 
			
		||||
ConsoleWindow::~ConsoleWindow()
 | 
			
		||||
{
 | 
			
		||||
	
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -27,7 +27,7 @@ class ConsoleWindow : public QMainWindow
 | 
			
		||||
 | 
			
		||||
public:
 | 
			
		||||
	explicit ConsoleWindow(MinecraftProcess *proc, QWidget *parent = 0);
 | 
			
		||||
	virtual ~ConsoleWindow() {};
 | 
			
		||||
	virtual ~ConsoleWindow();
 | 
			
		||||
 | 
			
		||||
	/**
 | 
			
		||||
	 * @brief specify if the window is allowed to close
 | 
			
		||||
 
 | 
			
		||||
@@ -147,7 +147,7 @@ QString MinecraftVersion::getPatchFilename()
 | 
			
		||||
bool MinecraftVersion::needsUpdate()
 | 
			
		||||
{
 | 
			
		||||
	auto settings = MMC->settings();
 | 
			
		||||
	bool result = hasUpdate() && settings->get("AutoUpdateMinecraftVersions").toBool();
 | 
			
		||||
	bool result = m_versionSource == Remote || (hasUpdate() && settings->get("AutoUpdateMinecraftVersions").toBool());
 | 
			
		||||
	return result;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user