Commit 14f865e1 authored by Zebediah Figura's avatar Zebediah Figura Committed by Alexandre Julliard

msi: Don't queue a parent dialog to be shown in EndDialog.

When using "Return", the parent dialog already exists, so there is no need to do this. Moreover, if the parent dialog is queued, a subsequent "Exit" would not properly exit the parent dialog. Signed-off-by: 's avatarZebediah Figura <z.figura12@gmail.com> Signed-off-by: 's avatarHans Leidekker <hans@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 8826584b
...@@ -4381,12 +4381,7 @@ static UINT event_end_dialog( msi_dialog *dialog, const WCHAR *argument ) ...@@ -4381,12 +4381,7 @@ static UINT event_end_dialog( msi_dialog *dialog, const WCHAR *argument )
else if (!strcmpW( argument, ignoreW )) else if (!strcmpW( argument, ignoreW ))
dialog->package->CurrentInstallState = ERROR_SUCCESS; dialog->package->CurrentInstallState = ERROR_SUCCESS;
else if (!strcmpW( argument, returnW )) else if (!strcmpW( argument, returnW ))
{
msi_dialog *parent = dialog->parent;
msi_free( dialog->package->next_dialog );
dialog->package->next_dialog = (parent) ? strdupW( parent->name ) : NULL;
dialog->package->CurrentInstallState = ERROR_SUCCESS; dialog->package->CurrentInstallState = ERROR_SUCCESS;
}
else else
{ {
ERR("Unknown argument string %s\n", debugstr_w(argument)); ERR("Unknown argument string %s\n", debugstr_w(argument));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment