goldcollection
/
muwire
mirror of https://github.com/zlatinb/muwire
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

selected component can be null when closing a tab

pull/34/head
Zlatin Balevsky 2019-11-17 22:41:31 +00:00
parent a398ab7d4b
commit 2ed29be072
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gui/src/main/groovy/com/muwire/gui/ChatNotificator.groovy
View File

@ -24,6 +24,12 @@ class ChatNotificator {
void serverTabChanged(JTabbedPane source) { void serverTabChanged(JTabbedPane source) {
JPanel panel = source.getSelectedComponent() JPanel panel = source.getSelectedComponent()
if (panel == null) {
currentServerTab = null
currentRoomTab = null
return
}
String mvcId = panel.getClientProperty("mvcId") String mvcId = panel.getClientProperty("mvcId")
def group = groupManager.getGroups().get(mvcId) def group = groupManager.getGroups().get(mvcId)
JTabbedPane childPane = panel.getClientProperty("childPane") JTabbedPane childPane = panel.getClientProperty("childPane")
@ -40,6 +46,10 @@ class ChatNotificator {
void roomTabChanged(JTabbedPane source) { void roomTabChanged(JTabbedPane source) {
JPanel panel = source.getSelectedComponent() JPanel panel = source.getSelectedComponent()
if (panel == null) {
currentRoomTab = null
return
}
currentRoomTab = panel.getClientProperty("mvcId") currentRoomTab = panel.getClientProperty("mvcId")
roomsWithMessages.remove(currentRoomTab) roomsWithMessages.remove(currentRoomTab)
updateBadge() updateBadge()