summaryrefslogtreecommitdiff
path: root/servers/visual/visual_server_viewport.h
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2019-06-27 01:05:18 +0200
committerGitHub <noreply@github.com>2019-06-27 01:05:18 +0200
commiteaaff9da3178fa515a0f051fda932c1dd04d53db (patch)
tree56173535c376e0324f89baccf4bc14b2580ead23 /servers/visual/visual_server_viewport.h
parentd8c96461183f0dc3208c3d624674fa4544212ea5 (diff)
parent4e5310cc60dc17e5ef09e57115ca8236544679e4 (diff)
Merge pull request #29941 from qarmin/redundant_code_and_others
Remove redundant code, possible NULL pointers and others
Diffstat (limited to 'servers/visual/visual_server_viewport.h')
-rw-r--r--servers/visual/visual_server_viewport.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/servers/visual/visual_server_viewport.h b/servers/visual/visual_server_viewport.h
index 43bbcb66c3..bdd4c1d4f2 100644
--- a/servers/visual/visual_server_viewport.h
+++ b/servers/visual/visual_server_viewport.h
@@ -138,9 +138,8 @@ public:
if (left_to_screen == right_to_screen) {
return p_left->parent == p_right->self;
- } else {
- return right_to_screen;
}
+ return right_to_screen;
}
};