From c12f698c9581baeadc3579169995eaf83283b268 Mon Sep 17 00:00:00 2001 From: rakshasa Date: Sun, 3 Oct 2010 12:14:57 +0000 Subject: [PATCH] * Fixed 'view_*' commands. git-svn-id: svn://rakshasa.no/libtorrent/trunk/rtorrent@1176 e378c898-3ddf-0310-93e7-cc216c733640 --- src/core/view_manager.cc | 4 ++-- src/main.cc | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/core/view_manager.cc b/src/core/view_manager.cc index 0ba59886..30cb490b 100644 --- a/src/core/view_manager.cc +++ b/src/core/view_manager.cc @@ -62,8 +62,8 @@ ViewManager::clear() { ViewManager::iterator ViewManager::insert(const std::string& name) { - if (find(name) != end()) - throw torrent::internal_error("ViewManager::insert(...) name already inserted."); + if (find(name) != end() || name.empty()) + throw torrent::input_error("View with same name already inserted."); View* view = new View(); view->initialize(name); diff --git a/src/main.cc b/src/main.cc index 8cbe9cf1..c1a49b57 100644 --- a/src/main.cc +++ b/src/main.cc @@ -742,14 +742,14 @@ main(int argc, char** argv) { // View: // - CMD2_REDIRECT ("view_add", "view.add"); - CMD2_REDIRECT ("view_filter", "view.filter"); - CMD2_REDIRECT ("view_filter_on", "view.filter_on"); - CMD2_REDIRECT ("view_list", "view.list"); - CMD2_REDIRECT ("view_set", "view.set"); - CMD2_REDIRECT ("view_sort", "view.sort"); - CMD2_REDIRECT ("view_sort_current", "view.sort_current"); - CMD2_REDIRECT ("view_sort_new", "view.sort_new"); + CMD2_REDIRECT_GENERIC("view_add", "view.add"); + CMD2_REDIRECT_GENERIC("view_filter", "view.filter"); + CMD2_REDIRECT_GENERIC("view_filter_on", "view.filter_on"); + CMD2_REDIRECT_GENERIC("view_list", "view.list"); + CMD2_REDIRECT_GENERIC("view_set", "view.set"); + CMD2_REDIRECT_GENERIC("view_sort", "view.sort"); + CMD2_REDIRECT_GENERIC("view_sort_current", "view.sort_current"); + CMD2_REDIRECT_GENERIC("view_sort_new", "view.sort_new"); // Rename these to avoid conflicts with old style. CMD2_REDIRECT_GENERIC("d.multicall", "d.multicall2");