aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrathnor <rathnor>2002-12-09 14:17:50 (GMT)
committerrathnor <rathnor>2002-12-09 14:17:50 (GMT)
commitf758ee4bbd4785c65c838a12507e3f6f5f63d210 (patch)
tree96d966aca92fde25fe6bf7f6b3027203d8b3ae9d
parente4c680e4cf73bc6da6435148265e8668b8de7dee (diff)
downloadfluxbox-f758ee4bbd4785c65c838a12507e3f6f5f63d210.zip
fluxbox-f758ee4bbd4785c65c838a12507e3f6f5f63d210.tar.bz2
proper fix for [ 561602 ] Problem using ToggleDecor in terminals.
old_decoration wasn't initialised.
-rw-r--r--src/Window.cc10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/Window.cc b/src/Window.cc
index cf88219..e54a1de 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Window.cc,v 1.106 2002/12/01 13:42:03 rathnor Exp $ 25// $Id: Window.cc,v 1.107 2002/12/09 14:17:50 rathnor Exp $
26 26
27#include "Window.hh" 27#include "Window.hh"
28 28
@@ -71,7 +71,7 @@ FluxboxWindow::FluxboxWindow(Window w, BScreen *s):
71 display(0), 71 display(0),
72 lastButtonPressTime(0), 72 lastButtonPressTime(0),
73 m_windowmenu(0), 73 m_windowmenu(0),
74 m_layer(LAYER_NORMAL), 74 m_layer(LAYER_NORMAL), old_decoration(DECOR_NORMAL),
75 tab(0) { 75 tab(0) {
76 76
77 lastFocusTime.tv_sec = lastFocusTime.tv_usec = 0; 77 lastFocusTime.tv_sec = lastFocusTime.tv_usec = 0;
@@ -3177,7 +3177,11 @@ void FluxboxWindow::toggleDecoration() {
3177 setDecoration(DECOR_NONE); 3177 setDecoration(DECOR_NONE);
3178 decorations.enabled = false; 3178 decorations.enabled = false;
3179 } else { //revert back to old decoration 3179 } else { //revert back to old decoration
3180 setDecoration(old_decoration); 3180 if (old_decoration == DECOR_NONE) { // make sure something happens
3181 setDecoration(DECOR_NORMAL);
3182 } else {
3183 setDecoration(old_decoration);
3184 }
3181 decorations.enabled = true; 3185 decorations.enabled = true;
3182 } 3186 }
3183} 3187}