diff options
| author | Piotr Srebrny <piotr.srebrny@qt.io> | 2021-09-10 19:05:48 +0200 |
|---|---|---|
| committer | Piotr Srebrny <piotr.srebrny@qt.io> | 2021-09-13 12:17:46 +0200 |
| commit | e93a3c66bef99e291c6ee5e5fd183900bc89b223 (patch) | |
| tree | ce2625820cc86a5e540ecb9f978c4d753564c4c0 /src/multimedia | |
| parent | 81a3ea8ef3868818bdca2fb3fb7a76553f9b35ec (diff) | |
Close WMF player session on media player destruction
Additionally removing some spooky function creating dangling pointer
Fixes: QTBUG-95626
Pick-to: 6.2 6.2.0
Change-Id: I887ef7a309dde42c9594d4f94a84d72d86380579
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/multimedia')
| -rw-r--r-- | src/multimedia/platform/windows/player/mfplayercontrol.cpp | 2 | ||||
| -rw-r--r-- | src/multimedia/platform/windows/player/mfplayersession_p.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/multimedia/platform/windows/player/mfplayercontrol.cpp b/src/multimedia/platform/windows/player/mfplayercontrol.cpp index b114e3264..47e74ab38 100644 --- a/src/multimedia/platform/windows/player/mfplayercontrol.cpp +++ b/src/multimedia/platform/windows/player/mfplayercontrol.cpp @@ -58,7 +58,7 @@ MFPlayerControl::MFPlayerControl(QMediaPlayer *player) MFPlayerControl::~MFPlayerControl() { - m_session->clearPlayer(); + m_session->close(); m_session->Release(); } diff --git a/src/multimedia/platform/windows/player/mfplayersession_p.h b/src/multimedia/platform/windows/player/mfplayersession_p.h index 7dab56f5c..bc7504d05 100644 --- a/src/multimedia/platform/windows/player/mfplayersession_p.h +++ b/src/multimedia/platform/windows/player/mfplayersession_p.h @@ -118,7 +118,6 @@ public: void changeStatus(QMediaPlayer::MediaStatus newStatus); void close(); - void clearPlayer() { m_playerControl = nullptr; } void setAudioOutput(QPlatformAudioOutput *device); |