From owner-p4-projects@FreeBSD.ORG  Mon Jul 27 22:02:50 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id BA8EE1065677; Mon, 27 Jul 2009 22:02:49 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7609C106564A
	for <perforce@FreeBSD.org>; Mon, 27 Jul 2009 22:02:49 +0000 (UTC)
	(envelope-from jona@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 649858FC16
	for <perforce@FreeBSD.org>; Mon, 27 Jul 2009 22:02:49 +0000 (UTC)
	(envelope-from jona@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n6RM2nPJ048428
	for <perforce@FreeBSD.org>; Mon, 27 Jul 2009 22:02:49 GMT
	(envelope-from jona@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n6RM2n0E048426
	for perforce@freebsd.org; Mon, 27 Jul 2009 22:02:49 GMT
	(envelope-from jona@FreeBSD.org)
Date: Mon, 27 Jul 2009 22:02:49 GMT
Message-Id: <200907272202.n6RM2n0E048426@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jona@FreeBSD.org using -f
From: Jonathan Anderson <jona@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 166659 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Jul 2009 22:02:51 -0000

http://perforce.freebsd.org/chv.cgi?CH=166659

Change 166659 by jona@jona-trustedbsd-belle-vmware on 2009/07/27 22:02:23

	Only close the current file if we successfully open another one

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/tools/cap/sandbox_qt/TextEditor.cpp#6 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/tools/cap/sandbox_qt/TextEditor.cpp#6 (text+ko) ====

@@ -65,8 +65,6 @@
 
 void TextEditor::open()
 {
-	close();
-
 	struct ua_powerbox_options options;
 	options.ui              = UA_QT;
 	options.operation       = UA_OPEN_FILE;
@@ -103,6 +101,8 @@
 		return;
 	}
 
+	close();
+
 	QFile file(this);
 	file.open(fd, QFile::ReadWrite | QFile::Unbuffered);
 	ui.text->setPlainText(file.readAll());