*** pgadmin/frm/frmQuery.cpp.orig	2010-01-26 00:52:01.000000000 -0200
--- pgadmin/frm/frmQuery.cpp	2010-01-26 00:54:01.000000000 -0200
***************
*** 1892,1897 ****
--- 1892,1900 ----
  void frmQuery::OnBuffers(wxCommandEvent& event)
  {
      queryMenu->Enable(MNU_EXPLAIN, !queryMenu->IsChecked(MNU_BUFFERS));
+     toolBar->EnableTool(MNU_EXPLAIN, !queryMenu->IsChecked(MNU_BUFFERS));
+ 
+     settings->SetExplainBuffers(queryMenu->IsChecked(MNU_BUFFERS));
  }
  
  // Update the main SQL query from the GQB if desired
***************
*** 2111,2122 ****
      toolBar->EnableTool(MNU_EXECUTE, !running);
      toolBar->EnableTool(MNU_EXECPGS, !running);
      toolBar->EnableTool(MNU_EXECFILE, !running);
!     toolBar->EnableTool(MNU_EXPLAIN, !running);
      toolBar->EnableTool(MNU_CANCEL, running);
      queryMenu->Enable(MNU_EXECUTE, !running);
      queryMenu->Enable(MNU_EXECPGS, !running);
      queryMenu->Enable(MNU_EXECFILE, !running);
!     queryMenu->Enable(MNU_EXPLAIN, !running);
      queryMenu->Enable(MNU_CANCEL, running);
      fileMenu->Enable(MNU_EXPORT, sqlResult->CanExport());
      fileMenu->Enable(MNU_QUICKREPORT, sqlResult->CanExport());
--- 2114,2126 ----
      toolBar->EnableTool(MNU_EXECUTE, !running);
      toolBar->EnableTool(MNU_EXECPGS, !running);
      toolBar->EnableTool(MNU_EXECFILE, !running);
!     toolBar->EnableTool(MNU_EXPLAIN, (!running && !settings->GetExplainBuffers()));
      toolBar->EnableTool(MNU_CANCEL, running);
      queryMenu->Enable(MNU_EXECUTE, !running);
      queryMenu->Enable(MNU_EXECPGS, !running);
      queryMenu->Enable(MNU_EXECFILE, !running);
!     queryMenu->Enable(MNU_EXPLAIN, (!running && !settings->GetExplainBuffers()));
! 	queryMenu->Enable(MNU_EXPLAINANALYZE, !running);
      queryMenu->Enable(MNU_CANCEL, running);
      fileMenu->Enable(MNU_EXPORT, sqlResult->CanExport());
      fileMenu->Enable(MNU_QUICKREPORT, sqlResult->CanExport());
