an attempt to fix #1377

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
@@ -32,9 +32,9 @@ using namespace Opie::Core;
 #include <sys/ioctl.h>
 #include <linux/vt.h>
 
 VTApplet::VTApplet ( )
-    : QObject ( 0, "VTApplet" )
+         :QObject( 0, "VTApplet" ), m_ourVT( 0 )
 {
 }
 
 VTApplet::~VTApplet ( )
@@ -95,8 +95,10 @@ QPopupMenu *VTApplet::popup ( QWidget* parent ) const
         m_subMenu->setItemChecked( id, id-500 == vtstat.v_active );
     }
     ::close( fd );
 
+    m_ourVT = vtstat.v_active;
+
     connect( m_subMenu, SIGNAL( activated(int) ), this, SLOT( changeVT(int) ) );
     connect( m_subMenu, SIGNAL( aboutToShow() ), this, SLOT( updateMenu() ) );
 
     return m_subMenu;
@@ -113,8 +115,13 @@ void VTApplet::changeVT( int index )
     int fd = ::open("/dev/tty0", O_RDWR);
 #endif
     if ( fd == -1 ) return;
     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 );
+    }
 }
 
 
 void VTApplet::updateMenu()
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
@@ -45,8 +45,9 @@ public slots:
     virtual void changeVT( int index );
     virtual void updateMenu();
 private:
     mutable QPopupMenu* m_subMenu;
+    mutable int m_ourVT;
 };
 
 
 #endif