1
=== modified file 'libtelephonyservice/ringtone.cpp'
2
--- libtelephonyservice/ringtone.cpp	2015-05-15 20:27:54 +0000
3
+++ libtelephonyservice/ringtone.cpp	2015-11-03 17:39:42 +0000
4
@@ -40,9 +40,8 @@
5
40
        return;
40
        return;
6
41
    }
41
    }
7
42
42
11
43
    if (mCallAudioPlayer) {
43
    // force delete all media player instances
12
44
        return;
44
    stopIncomingCallSound();
10
45
    }
13
46
45
14
47
    // pick up the new ringtone in case it changed in the meantime
46
    // pick up the new ringtone in case it changed in the meantime
15
48
    mCallAudioPlaylist.addMedia(QUrl::fromLocalFile(GreeterContacts::instance()->incomingCallSound()));
47
    mCallAudioPlaylist.addMedia(QUrl::fromLocalFile(GreeterContacts::instance()->incomingCallSound()));
Reviewer	Review Type	Date Requested	Status
Gustavo Pichorim Boiko (community)		2015-11-03	Approve on 2015-11-18
PS Jenkins bot	continuous-integration		Approve on 2015-11-03
Review via email: mp+276576@code.launchpad.net
1	=== modified file 'libtelephonyservice/ringtone.cpp'
2	--- libtelephonyservice/ringtone.cpp 2015-05-15 20:27:54 +0000
3	+++ libtelephonyservice/ringtone.cpp 2015-11-03 17:39:42 +0000
4	@@ -40,9 +40,8 @@
5	40	return;	40	return;
6	41	}	41	}
7	42		42
11	43	if (mCallAudioPlayer) {	43	// force delete all media player instances
12	44	return;	44	stopIncomingCallSound();
10	45	}
13	46		45
14	47	// pick up the new ringtone in case it changed in the meantime	46	// pick up the new ringtone in case it changed in the meantime
15	48	mCallAudioPlaylist.addMedia(QUrl::fromLocalFile(GreeterContacts::instance()->incomingCallSound()));	47	mCallAudioPlaylist.addMedia(QUrl::fromLocalFile(GreeterContacts::instance()->incomingCallSound()));