* org-agenda.el (org-prepare-agenda-window): Use `org-pre-agenda-window-conf' if already set. (org-agenda-Quit): Set `org-pre-agenda-window-conf' to nil when quitting. (org-agenda-quit): Ditto. Thanks to Moritz Ulrich for reporting a bug about this.