Skip to content
Snippets Groups Projects
Commit 96882bc0 authored by Matyáš Latner's avatar Matyáš Latner
Browse files

After merge code cleanup

parent 577801c7
Branches
Tags
No related merge requests found
......@@ -462,17 +462,6 @@ public abstract class TablexiaApplication implements ApplicationListener {
}
}
/**
* Change current screen if is different from actual screen.
*
* @param screen new screen to change for
*/
public void setScreenIfIsDifferent(AbstractTablexiaScreen<?> screen) {
if (getScreen() == null || getScreen().getClass() != screen.getClass()) {
setScreen(screen);
}
}
/**
* Change current screen.
*
......@@ -512,7 +501,7 @@ public abstract class TablexiaApplication implements ApplicationListener {
*/
public void setScreenIfIsDifferent(AbstractTablexiaScreen<?> newScreen, ScreenTransaction screenTransaction) {
if (newScreen != null) {
if (getScreen() == null || getScreen().getClass() != newScreen.getClass() || TablexiaSettings.LOADER_SCREEN.equals(newScreen.getClass())) {
if (getScreen() == null || getScreen().getClass() != newScreen.getClass()) {
setScreen(newScreen, screenTransaction);
}
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment