From 08bebc7780ae5dde62ee161a24a7207823530944 Mon Sep 17 00:00:00 2001
From: monsta <monsta@inbox.ru>
Date: Mon, 25 Dec 2017 16:52:06 +0300
Subject: [PATCH] fix possible crash when handling DBus method call

fixes https://github.com/mate-desktop/mate-terminal/issues/85
---
 src/terminal.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/terminal.c b/src/terminal.c
index fd39e13..f8076a8 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -185,10 +185,10 @@ method_call_cb (GDBusConnection *connection,
 		                                  &error,
 		                                  NULL);
 
-        options->initial_workspace = initial_workspace;
-
 		if (options != NULL)
 		{
+			options->initial_workspace = initial_workspace;
+
 			terminal_app_handle_options (terminal_app_get (), options, FALSE /* no resume */, &error);
 			terminal_options_free (options);
 		}