diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-12-14 16:01:33 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-14 16:01:33 -0500 |
| commit | 4cc15a8919ce9eabe6901407381336e796e1f396 (patch) | |
| tree | 43b077c17cc7070ce2b911bc58cdf6d5ead739f3 /src/Emby.Server/Program.cs | |
| parent | 96e6b519b9997af1a0199142909d674c4e05dfd0 (diff) | |
| parent | de9cd28a7959f6920c82ff536339653334246c76 (diff) | |
Merge pull request #2342 from MediaBrowser/dev
Dev
Diffstat (limited to 'src/Emby.Server/Program.cs')
| -rw-r--r-- | src/Emby.Server/Program.cs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/Emby.Server/Program.cs b/src/Emby.Server/Program.cs index 24e391c73..26141a0ce 100644 --- a/src/Emby.Server/Program.cs +++ b/src/Emby.Server/Program.cs @@ -215,9 +215,12 @@ namespace Emby.Server var initProgress = new Progress<double>(); - // Not crazy about this but it's the only way to suppress ffmpeg crash dialog boxes - SetErrorMode(ErrorModes.SEM_FAILCRITICALERRORS | ErrorModes.SEM_NOALIGNMENTFAULTEXCEPT | - ErrorModes.SEM_NOGPFAULTERRORBOX | ErrorModes.SEM_NOOPENFILEERRORBOX); + if (environmentInfo.OperatingSystem == MediaBrowser.Model.System.OperatingSystem.Windows) + { + // Not crazy about this but it's the only way to suppress ffmpeg crash dialog boxes + SetErrorMode(ErrorModes.SEM_FAILCRITICALERRORS | ErrorModes.SEM_NOALIGNMENTFAULTEXCEPT | + ErrorModes.SEM_NOGPFAULTERRORBOX | ErrorModes.SEM_NOOPENFILEERRORBOX); + } var task = _appHost.Init(initProgress); Task.WaitAll(task); |