diff options
| author | whiteshark0 <whiteshark0@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2009-12-13 14:00:57 +0000 |
|---|---|---|
| committer | whiteshark0 <whiteshark0@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2009-12-13 14:00:57 +0000 |
| commit | daf6b407bd8ffc3af8d28f90909a94d7a34c92d3 (patch) | |
| tree | 202c61b8b2ef803d5a0769fbfc40f86a85c786dc /Lua/src | |
| parent | e8ab3f4e919d31b51a44c1eb0248b2bac1f16e57 (diff) | |
| download | usdx-daf6b407bd8ffc3af8d28f90909a94d7a34c92d3.tar.gz usdx-daf6b407bd8ffc3af8d28f90909a94d7a34c92d3.tar.xz usdx-daf6b407bd8ffc3af8d28f90909a94d7a34c92d3.zip | |
merged trunk r2029 into lua branch
- fix macosx compiling ?!
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@2030 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'Lua/src')
| -rw-r--r-- | Lua/src/Makefile.in | 2 | ||||
| -rw-r--r-- | Lua/src/screens/UScreenSong.pas | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Lua/src/Makefile.in b/Lua/src/Makefile.in index 06e62c43..6e221af9 100644 --- a/Lua/src/Makefile.in +++ b/Lua/src/Makefile.in @@ -122,7 +122,7 @@ endif LIBS ?= @LIBS@ LDFLAGS ?= @LDFLAGS@ -linkflags := -L/usr/lib $(sort $(LDFLAGS) $(LIBS)) +linkflags := -L/usr/lib $(LDFLAGS) $(sort $(LIBS)) ifneq ($(linkflags),) PLINKFLAGS := -k"$(linkflags)" endif diff --git a/Lua/src/screens/UScreenSong.pas b/Lua/src/screens/UScreenSong.pas index 3f94b6a4..716f4053 100644 --- a/Lua/src/screens/UScreenSong.pas +++ b/Lua/src/screens/UScreenSong.pas @@ -1715,6 +1715,10 @@ begin if not assigned(Song) then Exit; + //fix: if main cat than there is nothing to play + if Song.main then + Exit; + if AudioPlayback.Open(Song.Path.Append(Song.Mp3)) then begin PreviewOpened := Interaction; |