From 138de3a7ccee178e2beec4517b2696dc237af0a7 Mon Sep 17 00:00:00 2001
From: Vadim Yegorov <oo.zg.oo@gmail.com>
Date: Wed, 5 Apr 2017 17:46:20 +0000
Subject: [PATCH] =?UTF-8?q?1.=200003419:=20Crash=20=D0=BF=D1=80=D0=B8=20?=
 =?UTF-8?q?=D1=80=D0=B5=D1=81=D0=B0=D0=B9=D0=B7=D0=B5=20=D0=BE=D0=BA=D0=BD?=
 =?UTF-8?q?=D0=B0=20=D1=81=D0=BE=D0=B4=D0=B5=D1=80=D0=B6=D0=B0=D1=89=D0=B5?=
 =?UTF-8?q?=D0=B3=D0=BE=20=D0=BE=D1=82=D0=BA=D1=80=D1=8B=D1=82=D1=8B=D0=B9?=
 =?UTF-8?q?=20=D0=B2=D1=8B=D0=BF=D0=B0=D0=B4=D0=B0=D1=8E=D1=89=D0=B8=D0=B9?=
 =?UTF-8?q?=20=D1=81=D0=BF=D0=B8=D1=81=D0=BA=D0=BE=D0=BA.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 far/changelog  | 4 ++++
 far/dialog.cpp | 9 ++++++---
 far/vbuild.m4  | 2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/far/changelog b/far/changelog
index e2e6e49760..a7749a5ef6 100644
--- a/far/changelog
+++ b/far/changelog
@@ -1,3 +1,7 @@
+zg 05.04.2017 20:41:01 +0200 - build 4930
+
+1. 0003419: Crash при ресайзе окна содержащего открытый выпадающий спискок.
+
 svs 02.04.2017 20:22:22 +0300 - build 4929
 
 1. SQLite 3.18.0
diff --git a/far/dialog.cpp b/far/dialog.cpp
index fe1425bfb8..c73b512e34 100644
--- a/far/dialog.cpp
+++ b/far/dialog.cpp
@@ -6076,9 +6076,12 @@ void Dialog::SetComboBoxPos(DialogItemEx* CurItem)
 		{
 			CurItem = &Items[m_FocusPos];
 		}
-		int X1,Y1,X2,Y2;
-		CalcComboBoxPos(CurItem, CurItem->ListPtr->size(), X1, Y1, X2, Y2);
-		CurItem->ListPtr->SetPosition(X1, Y1, X2, Y2);
+		if (CurItem->ListPtr)
+		{
+			int X1, Y1, X2, Y2;
+			CalcComboBoxPos(CurItem, CurItem->ListPtr->size(), X1, Y1, X2, Y2);
+			CurItem->ListPtr->SetPosition(X1, Y1, X2, Y2);
+		}
 	}
 }
 
diff --git a/far/vbuild.m4 b/far/vbuild.m4
index da084a9be9..a95d14612d 100644
--- a/far/vbuild.m4
+++ b/far/vbuild.m4
@@ -1 +1 @@
-m4_define(BUILD,4929)m4_dnl
+m4_define(BUILD,4930)m4_dnl