Merge PR mumble-voip#6458: FEAT(client): Clear local mutes on Mumble …

…restart
Hartmnt · Jun 25, 2024 · 7fd66b5 · 7fd66b5
2 parents 56ee182 + 9b81fac
commit 7fd66b5
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/src/mumble/Database.cpp b/src/mumble/Database.cpp
@@ -399,6 +399,12 @@ void Database::setLocalMuted(const QString &hash, bool muted) {
 	execQueryAndLogFailure(query);
 }
 
+void Database::clearLocalMuted() {
+	QSqlQuery query(db);
+	query.prepare(QLatin1String("DELETE FROM `muted`"));
+	execQueryAndLogFailure(query);
+}
+
 ChannelFilterMode Database::getChannelFilterMode(const QByteArray &server_cert_digest, const unsigned int channel_id) {
 	QSqlQuery query(db);
 

diff --git a/src/mumble/Database.h b/src/mumble/Database.h
@@ -48,6 +48,7 @@ class Database : public QObject {
 
 	bool isLocalMuted(const QString &hash);
 	void setLocalMuted(const QString &hash, bool muted);
+	void clearLocalMuted();
 
 	float getUserLocalVolume(const QString &hash);
 	void setUserLocalVolume(const QString &hash, float volume);

diff --git a/src/mumble/main.cpp b/src/mumble/main.cpp
@@ -658,6 +658,7 @@ int main(int argc, char **argv) {
 
 	// Initialize database
 	Global::get().db = new Database(QLatin1String("main"));
+	Global::get().db->clearLocalMuted();
 
 #ifdef USE_ZEROCONF
 	// Initialize zeroconf