Fix crash on exit + minor improvements

Author: iakov

gamepadForm.cpp

@@ -53,15 +53,16 @@ GamepadForm::GamepadForm()
 
 GamepadForm::~GamepadForm()
 {
-	delete mUi;
+	thread.quit();
+	thread.wait();
 
-	// To prevent strange stack overflow crash on exit on Linux
-	delete videoWidget;
+	delete player;
+	delete mUi;
 }
 
 void GamepadForm::startControllerFromSysArgs(const QStringList &args)
 {
-	const auto &gamepadIp = args.at(1);	
+	const auto &gamepadIp = args.at(1);
 	const auto &gamepadPort = args.size() < 3 ? "4444" : args.at(2);
 	const auto &cameraPort = args.size() < 4 ? "8080" : args.at(3);
 	const auto &cameraIp = args.size() < 5 ? gamepadIp : args.at(4);
@@ -72,13 +73,6 @@ void GamepadForm::startControllerFromSysArgs(const QStringList &args)
 	Q_EMIT newConnectionParameters();
 }
 
-void GamepadForm::closeEvent(QCloseEvent *event)
-{
-	thread.quit();
-	thread.wait();
-	QWidget::closeEvent(event);
-}
-
 void GamepadForm::setUpGamepadForm()
 {
 	createMenu();
@@ -470,7 +464,7 @@ void GamepadForm::sendCommand(const QString &command)
 }
 
 void GamepadForm::changeMode(Strategies type)
-{	
+{
 	auto oldStratedy = strategy;
 	strategy = Strategy::getStrategy(type, this);
 	connect(strategy, &Strategy::commandPrepared, this, &GamepadForm::sendCommand);
@@ -532,9 +526,9 @@ void GamepadForm::saveImageToClipboard(QVideoFrame buffer)
 					int g = y - int(0.39465 * (u - 128)) - int(0.58060 * (v - 128));
 					int b = y + int(2.03211 * (u - 128));
 
-					r = r < 0 ? 0 : r > 255 ? 255 : r;
-					g = g < 0 ? 0 : g > 255 ? 255 : g;
-					b = b < 0 ? 0 : b > 255 ? 255 : b;
+					r = qBound(0, r, 255);
+					g = qBound(0, g, 255);
+					b = qBound(0, b, 255);
 
 					img.setPixel(j, i, qRgb(r, g, b));
 				}
@@ -551,7 +545,7 @@ void GamepadForm::requestImage()
 }
 
 void GamepadForm::openConnectDialog()
-{	
+{
 	mMyNewConnectForm = new ConnectForm(connectionManager, &mSettings, this);
 	connect(mMyNewConnectForm, &ConnectForm::newConnectionParameters, this, &GamepadForm::newConnectionParameters);
 	mMyNewConnectForm->show();

gamepadForm.h

@@ -61,9 +61,8 @@ class GamepadForm : public QWidget
 	~GamepadForm() override;
 	/// method that sets up connection manager and connect to host
 	void startControllerFromSysArgs(const QStringList &args);
-	virtual void closeEvent(QCloseEvent *event) override;
 
-public slots:
+public Q_SLOTS:
 
 	/// Slot for opening connect dialog
 	void openConnectDialog();
@@ -74,7 +73,7 @@ public slots:
 	/// Slot for about menu item
 	void about();
 
-private slots:
+private Q_SLOTS:
 
 	/// Slots for pad buttons (Up, Down, Left, Right) and "magic" buttons, triggered when button is pressed.
 	void handleButtonPress(QWidget*);
@@ -126,7 +125,7 @@ private slots:
 	void saveImageToClipboard(QVideoFrame buffer);
 	void requestImage();
 
-signals:
+Q_SIGNALS:
 	/// signal to send command
 	void commandReceived(QString);
 	/// signal to disconnect from host

languages/trikDesktopGamepad_de.ts

@@ -171,7 +171,7 @@ Buttons enabled.</source>
 Buttons aktiviert.</translation>
     </message>
     <message>
-        <location filename="../gamepadForm.cpp" line="+238"/>
+        <location filename="../gamepadForm.cpp" line="+232"/>
         <source>Couldn&apos;t connect to robot</source>
         <translation>Fehler beim Roboter zu verbinden</translation>
     </message>

languages/trikDesktopGamepad_en.ts

@@ -165,7 +165,7 @@ Buttons disabled.</source>
 Buttons disabled.</translation>
     </message>
     <message>
-        <location filename="../gamepadForm.cpp" line="+238"/>
+        <location filename="../gamepadForm.cpp" line="+232"/>
         <source>Couldn&apos;t connect to robot</source>
         <translation>Failed to connect to robot</translation>
     </message>

languages/trikDesktopGamepad_fr.ts

@@ -171,7 +171,7 @@ Buttons enabled.</source>
 Boutons activés.</translation>
     </message>
     <message>
-        <location filename="../gamepadForm.cpp" line="+238"/>
+        <location filename="../gamepadForm.cpp" line="+232"/>
         <source>Couldn&apos;t connect to robot</source>
         <translation>Impossible de se connecter au robot de</translation>
     </message>

languages/trikDesktopGamepad_ru.ts

@@ -169,7 +169,7 @@ Buttons disabled.</source>
 Кнопки выключены.</translation>
     </message>
     <message>
-        <location filename="../gamepadForm.cpp" line="+238"/>
+        <location filename="../gamepadForm.cpp" line="+232"/>
         <source>Couldn&apos;t connect to robot</source>
         <translation>Не удалось подключиться к роботу</translation>
     </message>

lsan.supp

@@ -1,6 +1,9 @@
 leak:*/libfontconfig.so.1*
-#leaks private object as of Qt5.12.7
+leak:g_quark_init
+#leaks private object as of Qt5.15.3
 leak:QVideoProbe::QVideoProbe
 leak:QVideoProbe::setSource(QMediaObject*)
 leak:QVideoWidget::setMediaObject(QMediaObject*)
-leak:QXcbIntegration::createPlatformWindow
+
+#leaks in Qt5.12
+#leak:QXcbIntegration::createPlatformWindow