From 7ec68d326be23e4a442ed78f92a483cc950b2c83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Thu, 27 Apr 2023 16:07:05 -0400
Subject: [PATCH] callsettings: fix ringtone path selection
Change-Id: I033ee8497ad0424b9d106cace7eb796c7ced599b
---
src/app/currentaccount.cpp | 5 +++++
src/app/utils.cpp | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/app/currentaccount.cpp b/src/app/currentaccount.cpp
index b836e9106..12dda4ba3 100644
--- a/src/app/currentaccount.cpp
+++ b/src/app/currentaccount.cpp
@@ -18,6 +18,8 @@
#include "currentaccount.h"
+#include "utils.h"
+
CurrentAccount::CurrentAccount(LRCInstance* lrcInstance,
AppSettingsManager* settingsManager,
QObject* parent)
@@ -188,6 +190,9 @@ CurrentAccount::updateData()
// Ringtone
set_ringtoneEnabledRingtone(accConfig.Ringtone.ringtoneEnabled, true);
set_ringtonePathRingtone(accConfig.Ringtone.ringtonePath, true);
+ if (get_ringtonePathRingtone() == "default.opus" || get_ringtonePathRingtone().isEmpty()) {
+ set_ringtonePathRingtone(Utils::GetRingtonePath(), true);
+ }
// Moderators
set_isAllModeratorsEnabled(lrcInstance_->accountModel().isAllModerators(
diff --git a/src/app/utils.cpp b/src/app/utils.cpp
index 914bc65d6..945e3aba2 100644
--- a/src/app/utils.cpp
+++ b/src/app/utils.cpp
@@ -341,7 +341,7 @@ Utils::GetRingtonePath()
#ifdef Q_OS_WIN
return QCoreApplication::applicationDirPath() + "\\ringtones\\default.opus";
#else
- return QString("/usr/share/ring/ringtones/default.opus");
+ return QString("/usr/share/jami/ringtones/default.opus");
#endif
}
--
GitLab