From 6fea1a87610274ef98d06af64ef08634560197bd Mon Sep 17 00:00:00 2001
From: Ilari Liusvaara <ilari.liusvaara@elisanet.fi>
Date: Sat, 14 Aug 2010 22:51:38 +0300
Subject: [PATCH] Don't loadstate with DnD when running

---
 Changelog.utf8                 | 1 +
 org/jpc/plugins/PCControl.java | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/Changelog.utf8 b/Changelog.utf8
index 5c276ae..d0a24ec 100644
--- a/Changelog.utf8
+++ b/Changelog.utf8
@@ -43,6 +43,7 @@ Changes since JPC-RR Release 10.5:
 - Fix crash on event stream truncation.
 - Don't do weird stuff with VGA frame numbers.
 - Support savestate drag'n'drop loading.
+- Don't loadstate via DnD when running.
 
 Changes from JPC-RR Release 10.14 to JPC-RR Release 10.15:
 ==========================================================
diff --git a/org/jpc/plugins/PCControl.java b/org/jpc/plugins/PCControl.java
index b5bdcbe..b2fa2a5 100644
--- a/org/jpc/plugins/PCControl.java
+++ b/org/jpc/plugins/PCControl.java
@@ -134,6 +134,10 @@ public class PCControl implements Plugin, PCMonitorPanelEmbedder
 
         public void drop(DropTargetDropEvent e)
         {
+            if(running) {
+                e.rejectDrop();
+                return;
+            }
             e.acceptDrop(DnDConstants.ACTION_COPY);
             int i = 0;
             for(DataFlavor f : e.getCurrentDataFlavors()) {
-- 
2.11.4.GIT