← Back to branch summary

~ubuntu-branches/ubuntu/wily/monodevelop/wily

« back to all changes in this revision

Viewing changes to src/core/MonoDevelop.Components/MonoDevelop.Components.Commands/CommandManager.cs

  • Committer: Bazaar Package Importer
  • Author(s): Jo Shields
  • Date: 2010-02-02 11:39:59 UTC
  • mfrom: (10.2.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20100202113959-n3u848nfj35yyd03
Tags: 2.2.1+dfsg-1
* New upstream release
* debian/control:
  + Standards version 3.8.4 (no changes needed)
* debian/patches/remove_support_for_non_debian_functionality.patch,
  debian/patches/remove_support_for_soft_debugger.patch,
  debian/patches/remove_support_for_moonlight.patch,
  debian/rules:
  + Split patch into two pieces, to make it easier to enable either
    SDB or Moonlight support with a rebuild
* debian/monodevelop-moonlight.install,
  debian/monodevelop-debugger-sdb.install,
  debian/control:
  + Create packaging data for the Soft Debugger addin and Moonlight addin -
    and comment them out of debian/control as we can't provide them on
    Debian for now

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/core/MonoDevelop.Components/MonoDevelop.Components.Commands/CommandManager.cs
245
245
                        w.Destroyed -= TopLevelDestroyed;
246
246
                        w.KeyPressEvent -= OnKeyPressed;
247
247
                        topLevelWindows.Remove (w);
 
248
                        if (w == lastFocused)
 
249
                                lastFocused = null;
248
250
                }
249
251
                
250
252
                public void Dispose ()
251
253
                {
252
254
                        disposed = true;
253
255
                        bindings.Dispose ();
 
256
                        lastFocused = null;
254
257
                }
255
258
                
256
259
                public void LockAll ()
1010
1013
                
1011
1014
                void UpdateToolbars ()
1012
1015
                {
 
1016
                        // This might get called after the app has exited, e.g. after executing the quit command
 
1017
                        // It then queries widgets, which resurrects widget wrappers, which breaks on managed widgets
 
1018
                        if (this.disposed)
 
1019
                                return;
 
1020
                        
1013
1021
                        object activeWidget = GetActiveWidget (rootWidget);
1014
1022
                        foreach (CommandToolbar toolbar in toolbars) {
1015
1023
                                if (toolbar.Visible)