Improve console - added disconnection from host before closing tab

uglide · uglide · commit 506d4691eac5 · 2013-12-27T20:57:47.000+02:00
diff --git a/redis-desktop-manager/source/widgets/consoleTab.cpp b/redis-desktop-manager/source/widgets/consoleTab.cpp
@@ -28,14 +28,15 @@ ConsoleTab::ConsoleTab(RedisConnectionConfig& config)
     connect(connection, SIGNAL(changePrompt(const QString &, bool)), this, SLOT(setPrompt(const QString &, bool)));
     connect(connection, SIGNAL(addOutput(const QString&)), this, SLOT(printCommandExecutionResults(const QString&)));
     connect(&connectionThread, SIGNAL(started()), connection, SLOT(init()));
+    connect(&connectionThread, SIGNAL(finished()), connection, SLOT(disconnect()));
     
     connectionThread.start();
 }
 
 ConsoleTab::~ConsoleTab(void)
 {
     connectionThread.quit();
-    connectionThread.wait();
+    connectionThread.wait(30000);
 }
 
 void ConsoleTab::setPrompt(const QString & str, bool display)

Original file line number	Diff line number	Diff line change
`@@ -28,14 +28,15 @@ ConsoleTab::ConsoleTab(RedisConnectionConfig& config)`
`28`	`28`	`connect(connection, SIGNAL(changePrompt(const QString &, bool)), this, SLOT(setPrompt(const QString &, bool)));`
`29`	`29`	`connect(connection, SIGNAL(addOutput(const QString&)), this, SLOT(printCommandExecutionResults(const QString&)));`
`30`	`30`	`connect(&connectionThread, SIGNAL(started()), connection, SLOT(init()));`
	`31`	`+ connect(&connectionThread, SIGNAL(finished()), connection, SLOT(disconnect()));`
`31`	`32`
`32`	`33`	`connectionThread.start();`
`33`	`34`	`}`
`34`	`35`
`35`	`36`	`ConsoleTab::~ConsoleTab(void)`
`36`	`37`	`{`
`37`	`38`	`connectionThread.quit();`
`38`		`- connectionThread.wait();`
	`39`	`+ connectionThread.wait(30000);`
`39`	`40`	`}`
`40`	`41`
`41`	`42`	`void ConsoleTab::setPrompt(const QString & str, bool display)`