Permalink
Browse files

Switch to Control.Exception

  • Loading branch information...
1 parent 7d78e4e commit 4479e490968e7534d3a668140cdb7c099528a6e7 @conal committed Feb 7, 2012
Showing with 5 additions and 3 deletions.
  1. +1 −1 shady-render.cabal
  2. +4 −2 src/Shady/MechanicsGLGlut.hs
View
@@ -1,5 +1,5 @@
Name: shady-render
-Version: 0.6.0
+Version: 0.6.1
Cabal-Version: >= 1.6
Synopsis: Functional GPU programming - rendering
Category: Graphics, GPU
@@ -14,6 +14,8 @@
module Shady.MechanicsGLGlut (shadyInit) where
+import Prelude hiding (catch)
+import Control.Exception (SomeException(..), catch)
import Graphics.Rendering.OpenGL hiding (Shader,Program,Index,Sink)
@@ -62,8 +64,8 @@ shadyInit title =
-- get glVersion >>= putStr . (++ ", ")
-- get shadingLanguageVersion >>= putStrLn
displayCallback $= return () -- real update via timer.
- catch (actionOnWindowClose $= MainLoopReturns)
- (const (return ()))
+ catch (actionOnWindowClose $= MainLoopReturns)
+ (\ (SomeException _) -> return ())
putStrLn "finished shadyInit"
return $ timedDisplay . display

0 comments on commit 4479e49

Please sign in to comment.