From dcb5bf58f21e63f71f38d38d9023c2467e22fac0 Mon Sep 17 00:00:00 2001
From: Damien Elmes <git@ichi2.net>
Date: Wed, 22 Dec 2010 01:36:24 +0900
Subject: [PATCH] always setup media; try to find media from old dropbox
 location

---
 ankiqt/ui/main.py | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/ankiqt/ui/main.py b/ankiqt/ui/main.py
index a92b61620..cf73c92a5 100755
--- a/ankiqt/ui/main.py
+++ b/ankiqt/ui/main.py
@@ -748,8 +748,7 @@ Debug info:\n%s""") % traceback.format_exc(), help="DeckErrors")
             and self.deck.syncName):
             if self.syncDeck(interactive=False):
                 return True
-        if interactive:
-            self.setupMedia(self.deck)
+        self.setupMedia(self.deck)
         try:
             self.deck.initUndo()
             self.moveToState("initial")
@@ -2918,12 +2917,19 @@ to work with this version of Anki."""))
         # check if the media has moved
         migrateFrom = None
         if prev != next:
-            # find the old location
-            deck.mediaPrefix = prev
-            dir = deck.mediaDir()
-            if dir and os.listdir(dir):
-                # it contains files; we'll need to migrate
-                migrateFrom = dir
+            # check if they were using plugin
+            if not prev:
+                p = self.dropboxFolder()
+                p = p.replace("/Anki", "").replace("\\Anki", "")
+                deck.mediaPrefix = p
+                migrateFrom = deck.mediaDir()
+            if not migrateFrom:
+                # find the old location
+                deck.mediaPrefix = prev
+                dir = deck.mediaDir()
+                if dir and os.listdir(dir):
+                    # it contains files; we'll need to migrate
+                    migrateFrom = dir
         # setup new folder
         deck.mediaPrefix = next
         if migrateFrom: