equal
deleted
inserted
replaced
313 quint8 id = PagesStack.isEmpty() ? ID_PAGE_MAIN : PagesStack.pop(); |
313 quint8 id = PagesStack.isEmpty() ? ID_PAGE_MAIN : PagesStack.pop(); |
314 quint8 curid = ui.Pages->currentIndex(); |
314 quint8 curid = ui.Pages->currentIndex(); |
315 ui.Pages->setCurrentIndex(id); |
315 ui.Pages->setCurrentIndex(id); |
316 OnPageShown(id, curid); |
316 OnPageShown(id, curid); |
317 |
317 |
318 if (id == ID_PAGE_NETSERVER) { |
318 if (id == ID_PAGE_NETSERVER || (id == ID_PAGE_ROOMSLIST && !hwnet)) { |
319 GoBack(); |
319 GoBack(); |
320 } |
320 } |
321 if (id == ID_PAGE_NET) { |
321 if (id == ID_PAGE_NET) { |
322 if(hwnet || pnetserver) NetDisconnect(); |
322 if(hwnet || pnetserver) NetDisconnect(); |
323 } |
323 } |