From 3360020ab04352e7a60ecd4355068b9833c5b2f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Sundstr=C3=B6m?= Date: Sun, 6 Sep 2009 20:42:23 +0000 Subject: [PATCH] If moved to Trash, close window. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32972 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/apps/people/PeopleWindow.cpp | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/apps/people/PeopleWindow.cpp b/src/apps/people/PeopleWindow.cpp index 98d672f30f..baa5226163 100644 --- a/src/apps/people/PeopleWindow.cpp +++ b/src/apps/people/PeopleWindow.cpp @@ -22,6 +22,7 @@ #include #include #include +#include #include "PeopleApp.h" #include "PeopleView.h" @@ -223,6 +224,20 @@ TPeopleWindow::MessageReceived(BMessage* msg) // And our window title. SetTitle(name); + + // If moved to Trash, close window. + BVolume volume(device); + BPath trash; + find_directory(B_TRASH_DIRECTORY, &trash, false, + &volume); + BPath folder(fRef); + folder.GetParent(&folder); + if (folder == trash) { + delete fRef; + fRef = NULL; + PostMessage(B_QUIT_REQUESTED); + } + break; }