an attempt to fix #1377

2 files changed, 17 insertions, 9 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,4 +34,4 @@ using namespace Opie::Core;
 
-VTApplet::VTApplet ( )
-    : QObject ( 0, "VTApplet" )
+VTApplet::VTApplet()
+         :QObject( 0, "VTApplet" ), m_ourVT( 0 )
 {
@@ -39,3 +39,3 @@ VTApplet::VTApplet ( )
 
-VTApplet::~VTApplet ( )
+VTApplet::~VTApplet()
 {
@@ -43,3 +43,3 @@ VTApplet::~VTApplet ( )
 
-int VTApplet::position ( ) const
+int VTApplet::position() const
 {
@@ -48,3 +48,3 @@ int VTApplet::position ( ) const
 
-QString VTApplet::name ( ) const
+QString VTApplet::name() const
 {
@@ -53,3 +53,3 @@ QString VTApplet::name ( ) const
 
-QString VTApplet::text ( ) const
+QString VTApplet::text() const
 {
@@ -70,3 +70,3 @@ QString VTApplet::tr( const char* s, const char* p ) const
 
-QIconSet VTApplet::icon ( ) const
+QIconSet VTApplet::icon() const
 {
@@ -76,3 +76,3 @@ QIconSet VTApplet::icon ( ) const
 
-QPopupMenu *VTApplet::popup ( QWidget* parent ) const
+QPopupMenu *VTApplet::popup( QWidget* parent ) const
 {
@@ -98,2 +98,4 @@ QPopupMenu *VTApplet::popup ( QWidget* parent ) const
 
+    m_ourVT = vtstat.v_active;
+
     connect( m_subMenu, SIGNAL( activated(int) ), this, SLOT( changeVT(int) ) );
@@ -116,2 +118,7 @@ void VTApplet::changeVT( int index )
     ioctl( fd, VT_ACTIVATE, index-500 );
+    if ( m_ourVT )
+    {
+        odebug << "VTApplet::waiting for user to return to VT " << m_ourVT << oendl;
+        ioctl( fd, VT_WAITACTIVE, m_ourVT );
+    }
 }
@@ -150,3 +157,3 @@ void VTApplet::activated()
 
-QRESULT VTApplet::queryInterface ( const QUuid &uuid, QUnknownInterface **iface )
+QRESULT VTApplet::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
 {
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
@@ -48,2 +48,3 @@ private:
     mutable QPopupMenu* m_subMenu;
+    mutable int m_ourVT;
 };