Merge pull request #3728 from ann0see/bug/copilotMemleakFix

Author: ann0see

src/clientdlg.cpp

@@ -876,9 +876,7 @@ void CClientDlg::OnChatTextReceived ( QString strChatText )
 {
     if ( pSettings->bEnableAudioAlerts )
     {
-        QSoundEffect* sf = new QSoundEffect();
-        sf->setSource ( QUrl::fromLocalFile ( ":sounds/res/sounds/new_message.wav" ) );
-        sf->play();
+        PlayAudioAlert ( QUrl::fromLocalFile ( ":sounds/res/sounds/new_message.wav" ) );
     }
     ChatDlg.AddChatText ( strChatText );
 
@@ -927,9 +925,7 @@ void CClientDlg::OnNumClientsChanged ( int iNewNumClients )
 {
     if ( pSettings->bEnableAudioAlerts && iNewNumClients > iClients )
     {
-        QSoundEffect* sf = new QSoundEffect();
-        sf->setSource ( QUrl::fromLocalFile ( ":sounds/res/sounds/new_user.wav" ) );
-        sf->play();
+        PlayAudioAlert ( QUrl::fromLocalFile ( ":sounds/res/sounds/new_user.wav" ) );
     }
 
     // iNewNumClients will be zero on the first trigger of this signal handler when connecting to a new server.

src/clientdlg.h

@@ -60,7 +60,6 @@
 #include <QMessageBox>
 #include <QFileDialog>
 #include <QActionGroup>
-#include <QSoundEffect>
 #if QT_VERSION >= QT_VERSION_CHECK( 5, 6, 0 )
 #    include <QVersionNumber>
 #endif

src/util.cpp

@@ -758,6 +758,19 @@ QSize CMinimumStackedLayout::sizeHint() const
     }
     return QStackedLayout::sizeHint();
 }
+
+void PlayAudioAlert ( QUrl soundUrl )
+{
+    QSoundEffect* sf = new QSoundEffect();
+    QObject::connect ( sf, &QSoundEffect::playingChanged, sf, [sf]() {
+        if ( !sf->isPlaying() )
+        {
+            sf->deleteLater();
+        }
+    } );
+    sf->setSource ( soundUrl );
+    sf->play();
+}
 #endif
 
 /******************************************************************************\

src/util.h

@@ -75,6 +75,7 @@
 #include <QElapsedTimer>
 #include <QTextBoundaryFinder>
 #include <QTimer>
+
 #ifndef DISABLE_SRV_DNS
 #    include <QDnsLookup>
 #endif
@@ -94,6 +95,7 @@
 #    include <QDesktopServices>
 #    include <QKeyEvent>
 #    include <QStackedLayout>
+#    include <QSoundEffect>
 #    include "ui_aboutdlgbase.h"
 #endif
 
@@ -489,6 +491,8 @@ class CMinimumStackedLayout : public QStackedLayout
     CMinimumStackedLayout ( QWidget* parent = nullptr ) : QStackedLayout ( parent ) {}
     virtual QSize sizeHint() const override;
 };
+
+void PlayAudioAlert ( QUrl soundUrl );
 #endif
 
 /******************************************************************************\