-rw-r--r-- | core/pim/addressbook/addressbook.cpp | 8 | ||||
-rw-r--r-- | core/pim/addressbook/addressbook.h | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp index 055124c..60db2b4 100644 --- a/core/pim/addressbook/addressbook.cpp +++ b/core/pim/addressbook/addressbook.cpp | |||
@@ -746,9 +746,13 @@ void AddressbookWindow::flush() | |||
746 | 746 | ||
747 | 747 | ||
748 | void AddressbookWindow::closeEvent( QCloseEvent *e ) | 748 | void AddressbookWindow::closeEvent( QCloseEvent *e ) |
749 | { | 749 | { |
750 | 750 | if(active_view == AbView::CardView){ | |
751 | slotViewSwitched( AbView::TableView ); | ||
752 | e->ignore(); | ||
753 | return; | ||
754 | } | ||
751 | if(syncing) { | 755 | if(syncing) { |
752 | /* shouldn't we save, I hear you say? well its already been set | 756 | /* shouldn't we save, I hear you say? well its already been set |
753 | so that an edit can not occur during a sync, and we flushed | 757 | so that an edit can not occur during a sync, and we flushed |
754 | at the start of the sync, so there is no need to save | 758 | at the start of the sync, so there is no need to save |
@@ -893,9 +897,9 @@ void AddressbookWindow::slotViewSwitched( int view ) | |||
893 | } | 897 | } |
894 | 898 | ||
895 | // Tell the view about the selected view | 899 | // Tell the view about the selected view |
896 | m_abView -> setShowToView ( (AbView::Views) view ); | 900 | m_abView -> setShowToView ( (AbView::Views) view ); |
897 | 901 | active_view = view; | |
898 | } | 902 | } |
899 | 903 | ||
900 | 904 | ||
901 | void AddressbookWindow::slotListView() | 905 | void AddressbookWindow::slotListView() |
diff --git a/core/pim/addressbook/addressbook.h b/core/pim/addressbook/addressbook.h index 4c1e2f2..2bedc0b 100644 --- a/core/pim/addressbook/addressbook.h +++ b/core/pim/addressbook/addressbook.h | |||
@@ -131,7 +131,9 @@ private: | |||
131 | AbConfig m_config; | 131 | AbConfig m_config; |
132 | 132 | ||
133 | QAction* m_tableViewButton; | 133 | QAction* m_tableViewButton; |
134 | QAction* m_cardViewButton; | 134 | QAction* m_cardViewButton; |
135 | |||
136 | int active_view; | ||
135 | }; | 137 | }; |
136 | 138 | ||
137 | #endif | 139 | #endif |