equal
deleted
inserted
replaced
318 quint8 id = PagesStack.isEmpty() ? ID_PAGE_MAIN : PagesStack.pop(); |
318 quint8 id = PagesStack.isEmpty() ? ID_PAGE_MAIN : PagesStack.pop(); |
319 quint8 curid = ui.Pages->currentIndex(); |
319 quint8 curid = ui.Pages->currentIndex(); |
320 ui.Pages->setCurrentIndex(id); |
320 ui.Pages->setCurrentIndex(id); |
321 OnPageShown(id, curid); |
321 OnPageShown(id, curid); |
322 |
322 |
323 if (id == ID_PAGE_NETSERVER || (id == ID_PAGE_ROOMSLIST && !hwnet)) { |
323 if (id == ID_PAGE_NETSERVER) |
324 GoBack(); |
324 GoBack(); |
325 } |
325 if ((!hwnet) && (id == ID_PAGE_ROOMSLIST)) |
|
326 GoBack(); |
|
327 |
|
328 if ((!hwnet) || (!hwnet->isInRoom())) |
|
329 if (id == ID_PAGE_NETGAME || id == ID_PAGE_NETGAME) |
|
330 GoBack(); |
|
331 |
326 if (id == ID_PAGE_NET) { |
332 if (id == ID_PAGE_NET) { |
327 if(hwnet || pnetserver) NetDisconnect(); |
333 if(hwnet || pnetserver) NetDisconnect(); |
328 } |
334 } |
329 } |
335 } |
330 |
336 |