author | mickeyl <mickeyl> | 2005-06-20 15:48:41 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2005-06-20 15:48:41 (UTC) |
commit | 53e05ad30759aefd977e301c84b8b60a78819c76 (patch) (unidiff) | |
tree | 0a98e76e6d37c958dae43537dd371de320a6510f | |
parent | 3b02e2a868535628090567ed612d9fdb5b247f61 (diff) | |
download | opie-53e05ad30759aefd977e301c84b8b60a78819c76.zip opie-53e05ad30759aefd977e301c84b8b60a78819c76.tar.gz opie-53e05ad30759aefd977e301c84b8b60a78819c76.tar.bz2 |
an attempt to fix #1377
-rw-r--r-- | core/applets/vtapplet/vt.cpp | 9 | ||||
-rw-r--r-- | core/applets/vtapplet/vt.h | 1 |
2 files changed, 9 insertions, 1 deletions
diff --git a/core/applets/vtapplet/vt.cpp b/core/applets/vtapplet/vt.cpp index 0d4e657..7885f83 100644 --- a/core/applets/vtapplet/vt.cpp +++ b/core/applets/vtapplet/vt.cpp | |||
@@ -34,5 +34,5 @@ using namespace Opie::Core; | |||
34 | 34 | ||
35 | VTApplet::VTApplet ( ) | 35 | VTApplet::VTApplet ( ) |
36 | : QObject ( 0, "VTApplet" ) | 36 | :QObject( 0, "VTApplet" ), m_ourVT( 0 ) |
37 | { | 37 | { |
38 | } | 38 | } |
@@ -97,4 +97,6 @@ QPopupMenu *VTApplet::popup ( QWidget* parent ) const | |||
97 | ::close( fd ); | 97 | ::close( fd ); |
98 | 98 | ||
99 | m_ourVT = vtstat.v_active; | ||
100 | |||
99 | connect( m_subMenu, SIGNAL( activated(int) ), this, SLOT( changeVT(int) ) ); | 101 | connect( m_subMenu, SIGNAL( activated(int) ), this, SLOT( changeVT(int) ) ); |
100 | connect( m_subMenu, SIGNAL( aboutToShow() ), this, SLOT( updateMenu() ) ); | 102 | connect( m_subMenu, SIGNAL( aboutToShow() ), this, SLOT( updateMenu() ) ); |
@@ -115,4 +117,9 @@ void VTApplet::changeVT( int index ) | |||
115 | if ( fd == -1 ) return; | 117 | if ( fd == -1 ) return; |
116 | ioctl( fd, VT_ACTIVATE, index-500 ); | 118 | ioctl( fd, VT_ACTIVATE, index-500 ); |
119 | if ( m_ourVT ) | ||
120 | { | ||
121 | odebug << "VTApplet::waiting for user to return to VT " << m_ourVT << oendl; | ||
122 | ioctl( fd, VT_WAITACTIVE, m_ourVT ); | ||
123 | } | ||
117 | } | 124 | } |
118 | 125 | ||
diff --git a/core/applets/vtapplet/vt.h b/core/applets/vtapplet/vt.h index 4c92ddd..4fa73e5 100644 --- a/core/applets/vtapplet/vt.h +++ b/core/applets/vtapplet/vt.h | |||
@@ -47,4 +47,5 @@ public slots: | |||
47 | private: | 47 | private: |
48 | mutable QPopupMenu* m_subMenu; | 48 | mutable QPopupMenu* m_subMenu; |
49 | mutable int m_ourVT; | ||
49 | }; | 50 | }; |
50 | 51 | ||