diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-06-13 21:28:36 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-06-13 21:28:36 +0100 |
| commit | e36c24bf1522593976de7de2c4d79c76f0ba36a8 (patch) | |
| tree | b342028831b620944ebc5a45946d82c1f69f64d0 /src/tools | |
| parent | 43b4e55710271c797b5d251c891047ed4da20e10 (diff) | |
| parent | a991c734ebfedb5456cec827d5eaf2583fdbb9a1 (diff) | |
Merge branch 'master' of ssh://houllier/home/carl/git/dvdomatic
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/dvdomatic.cc | 2 | ||||
| -rw-r--r-- | src/tools/dvdomatic_batch.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/dvdomatic.cc b/src/tools/dvdomatic.cc index 71207c4ae..de94d0a2f 100644 --- a/src/tools/dvdomatic.cc +++ b/src/tools/dvdomatic.cc @@ -457,7 +457,7 @@ class App : public wxApp return false; } -#ifdef DVDOMATIC_POSIX +#ifdef DVDOMATIC_LINUX unsetenv ("UBUNTU_MENUPROXY"); #endif diff --git a/src/tools/dvdomatic_batch.cc b/src/tools/dvdomatic_batch.cc index 7a3d38d9c..d9ddb9d46 100644 --- a/src/tools/dvdomatic_batch.cc +++ b/src/tools/dvdomatic_batch.cc @@ -197,7 +197,7 @@ class App : public wxApp return false; } -#ifdef DVDOMATIC_POSIX +#ifdef DVDOMATIC_LINUX unsetenv ("UBUNTU_MENUPROXY"); #endif |