equal
deleted
inserted
replaced
297 quint8 id = PagesStack.isEmpty() ? ID_PAGE_MAIN : PagesStack.pop(); |
297 quint8 id = PagesStack.isEmpty() ? ID_PAGE_MAIN : PagesStack.pop(); |
298 quint8 curid = ui.Pages->currentIndex(); |
298 quint8 curid = ui.Pages->currentIndex(); |
299 ui.Pages->setCurrentIndex(id); |
299 ui.Pages->setCurrentIndex(id); |
300 OnPageShown(id, curid); |
300 OnPageShown(id, curid); |
301 |
301 |
302 if (id == ID_PAGE_ROOMSLIST) { |
302 if (id == ID_PAGE_ROOMSLIST || id == ID_PAGE_NETSERVER) { |
303 GoBack(); |
303 GoBack(); |
304 } |
304 } |
305 if (id == ID_PAGE_NET) { |
305 if (id == ID_PAGE_NET) { |
306 if(hwnet || pnetserver) NetDisconnect(); |
306 if(hwnet || pnetserver) NetDisconnect(); |
307 } |
307 } |