Merge pull request #2356 from MediaBrowser/beta

Beta
2016-12-18 02:32:59 -05:00 · 2016-12-18 02:32:59 -05:00 · 70f48f9cea
parent 357a3750de c15acd0ebc
commit 70f48f9cea
1 changed files with 8 additions and 1 deletions
--- a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
@ -80,7 +80,14 @@ namespace Emby.Server.Implementations.Data
                    AddColumn(db, "userdata", "SubtitleStreamIndex", "int", existingColumnNames);
                }, TransactionMode);

-                ImportUserDataIfNeeded(connection);
+                try
+                {
+                    ImportUserDataIfNeeded(connection);
+                }
+                catch (Exception ex)
+                {
+                    Logger.ErrorException("Error in ImportUserDataIfNeeded", ex);
+                }
            }
        }