tan
/
Spectral
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix undefined behavior when all users are logged out.

This commit is contained in:
Black Hat 2019-04-29 15:03:11 +08:00
parent 2a86fbd8b6
commit d8c98374e4
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
imports/Spectral/Panel/RoomListPanel.qml
View File

@ -13,8 +13,8 @@ import Spectral.Setting 0.1
import SortFilterProxyModel 0.2 import SortFilterProxyModel 0.2
Item { Item {
property var controller: null property var connection: null
readonly property var user: controller.connection ? controller.connection.localUser : null readonly property var user: connection ? connection.localUser : null
property int filter: 0 property int filter: 0
property var enteredRoom: null property var enteredRoom: null
@ -28,7 +28,7 @@ Item {
RoomListModel { RoomListModel {
id: roomListModel id: roomListModel
connection: controller.connection connection: root.connection
onNewMessage: if (!window.active && MSettings.showNotification) spectralController.postNotification(roomId, eventId, roomName, senderName, text, icon) onNewMessage: if (!window.active && MSettings.showNotification) spectralController.postNotification(roomId, eventId, roomName, senderName, text, icon)
} }

4
qml/main.qml
View File

@ -371,7 +371,7 @@ ApplicationWindow {
clip: true clip: true
controller: spectralController connection: spectralController.connection
onLeaveRoom: roomForm.saveReadMarker(room) onLeaveRoom: roomForm.saveReadMarker(room)
} }
@ -420,7 +420,7 @@ ApplicationWindow {
Component.onCompleted: { Component.onCompleted: {
spectralController.initiated.connect(function() { spectralController.initiated.connect(function() {
if (spectralController.accountCount == 0) loginDialog.open() if (spectralController.accountCount == 0) loginDialog.createObject(window).open()
}) })
} }
} }

2
src/controller.h
View File

@ -60,8 +60,6 @@ class Controller : public QObject {
} }
void setConnection(Connection* conn) { void setConnection(Connection* conn) {
if (!conn)
return;
if (conn == m_connection) if (conn == m_connection)
return; return;
m_connection = conn; m_connection = conn;