@@ -50,27 +50,30 @@ class TabSwitcherModal extends React.Component<{}, {}> {
5050 let oSessions = GlobalModel . sessionList ;
5151 let oScreens = GlobalModel . screenMap ;
5252 oScreens . forEach ( ( oScreen ) => {
53+ if ( oScreen == null ) {
54+ return ;
55+ }
56+ if ( oScreen . archived . get ( ) ) {
57+ return ;
58+ }
5359 // Find the matching session in the observable array
5460 let foundSession = oSessions . find ( ( s ) => {
55- if ( s . sessionId === oScreen . sessionId && s . archived . get ( ) == false ) {
56- return true ;
57- }
58- return false ;
61+ return s . sessionId == oScreen . sessionId && ! s . archived . get ( ) ;
5962 } ) ;
60-
61- if ( foundSession ) {
62- let data : SwitcherDataType = {
63- sessionName : foundSession . name . get ( ) ,
64- sessionId : foundSession . sessionId ,
65- sessionIdx : foundSession . sessionIdx . get ( ) ,
66- screenName : oScreen . name . get ( ) ,
67- screenId : oScreen . screenId ,
68- screenIdx : oScreen . screenIdx . get ( ) ,
69- icon : this . getTabIcon ( oScreen ) ,
70- color : this . getTabColor ( oScreen ) ,
71- } ;
72- this . options . push ( data ) ;
63+ if ( ! foundSession ) {
64+ return ;
7365 }
66+ let data : SwitcherDataType = {
67+ sessionName : foundSession . name . get ( ) ,
68+ sessionId : foundSession . sessionId ,
69+ sessionIdx : foundSession . sessionIdx . get ( ) ,
70+ screenName : oScreen . name . get ( ) ,
71+ screenId : oScreen . screenId ,
72+ screenIdx : oScreen . screenIdx . get ( ) ,
73+ icon : this . getTabIcon ( oScreen ) ,
74+ color : this . getTabColor ( oScreen ) ,
75+ } ;
76+ this . options . push ( data ) ;
7477 } ) ;
7578
7679 mobx . action ( ( ) => {
0 commit comments