From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 1937 invoked by alias); 1 Sep 2016 13:38:13 -0000 Mailing-List: contact cygwin-apps-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cygwin-apps-cvs-owner@sourceware.org Received: (qmail 1919 invoked by uid 9795); 1 Sep 2016 13:38:12 -0000 Date: Thu, 01 Sep 2016 13:38:00 -0000 Message-ID: <20160901133812.1893.qmail@sourceware.org> From: jturney@sourceware.org To: cygwin-apps-cvs@sourceware.org Subject: [setup - the official Cygwin setup program used to install Cygwin and keep it up to date] branch master, updated. release_2.874-26-gf2a16af X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: f882d56e593fe2338e4eb7c444719c4e8697fd87 X-Git-Newrev: f2a16aff20f2fe58ab9cad651e2b94916a0a773b X-SW-Source: 2016-q3/txt/msg00020.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=f2a16aff20f2fe58ab9cad651e2b94916a0a773b commit f2a16aff20f2fe58ab9cad651e2b94916a0a773b Author: Jon Turney Date: Thu Sep 1 13:45:59 2016 +0100 Fix scope problem with the FileInUse dialog The std::string we make for dlg_data.msg must remain in scope while the FileInUse modal dialog is shown. Signed-off-by: Jon Turney Diff: --- install.cc | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/install.cc b/install.cc index 8aad3a5..277737d 100644 --- a/install.cc +++ b/install.cc @@ -530,7 +530,8 @@ Installer::installOne (packagemeta &pkgm, const packageversion &ver, // listed processes, or just ignore the problem and schedule the file to be // replaced after a reboot FileInuseDlgData dlg_data; - dlg_data.msg = ("Unable to extract /" + fn).c_str (); + std::string msg = "Unable to extract /" + fn; + dlg_data.msg = msg.c_str (); dlg_data.processlist = plm.c_str (); dlg_data.iteration = iteration;