diff options
| author | Yonit Halperin <yhalperi@redhat.com> | 2011-07-21 10:07:57 +0300 |
|---|---|---|
| committer | Alon Levy <alevy@redhat.com> | 2011-07-21 15:09:30 +0300 |
| commit | 858596bb483c495998d738f394d39104e14931be (patch) | |
| tree | 68f83102d9458adb818c1930303fc0ae4615d36b /client/application.h | |
| parent | 3bc4fd4621798674b2a6d9537180d91ccde8ee0d (diff) | |
| download | spice-858596bb483c495998d738f394d39104e14931be.tar.gz spice-858596bb483c495998d738f394d39104e14931be.tar.xz spice-858596bb483c495998d738f394d39104e14931be.zip | |
client: fix endless recursion in rearrange_monitors, RHBZ #692976
I changed RedScreen::resize not to call rearrange_monitors. Instead,
the monitor should be configured correctly from Application, before
calling resize.
In addition, I made some cleanups to allow reusing rearrange_monitors code.
Diffstat (limited to 'client/application.h')
| -rw-r--r-- | client/application.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/client/application.h b/client/application.h index 4133dfe6..80797531 100644 --- a/client/application.h +++ b/client/application.h @@ -216,7 +216,6 @@ public: void on_disconnecting(); void on_visibility_start(int screen_id); - bool rearrange_monitors(RedScreen& screen); void enter_full_screen(); void exit_full_screen(); bool toggle_full_screen(); @@ -308,6 +307,9 @@ private: void assign_monitors(); void restore_monitors(); void prepare_monitors(); + void rearrange_monitors(bool force_capture, + bool enter_full_screen, + RedScreen* screen = NULL); void position_screens(); void show_full_screen(); void send_key_down(RedKey key); |